Mercurial > octave

changeset 24878:4fdb160b47fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Keep the '--no-gui' option as the inverse of '--gui' * libinterp/octave.cc (cmdline_options::cmdline_options): Continue to handle the '--no-gui' option. * libinterp/options-usage.h: Keep and continue to document '--no-gui'. * NEWS: Remove mention of '--no-gui' option.
author Mike Miller <mtmiller@octave.org>
date Wed, 14 Mar 2018 08:52:35 -0700
parents 0bb22c75c2d4
children 086e6a86f83f
files NEWS libinterp/octave.cc libinterp/options-usage.h
diffstat 3 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Wed Mar 14 16:12:32 2018 +0100
+++ b/NEWS	Wed Mar 14 08:52:35 2018 -0700
@@ -25,9 +25,7 @@
     interface and Desktop launchers required the `--force-gui' option
     anyway.  With this change, desktop launchers should change to use
     the new option `--gui'.  The previous `--force-gui' will continue to
-    work and maps to `--gui' but will be removed in Octave 4.8.  The old
-    option `--no-gui' is now irrelevant and is ignored.  It will also be
-    removed in Octave 4.8.
+    work and maps to `--gui' but will be removed in Octave 4.8.
 
  ** A new container data type--containers.Map--is available.  Map is a
     key/value storage container (a.k.a, a hash) that efficiently allows
--- a/libinterp/octave.cc	Wed Mar 14 16:12:32 2018 +0100
+++ b/libinterp/octave.cc	Wed Mar 14 08:52:35 2018 -0700
@@ -186,7 +186,7 @@
             break;
 
           case NO_GUI_OPTION:
-            // This option does nothing now.
+            m_gui = false;
             break;
 
           case NO_INIT_FILE_OPTION:
--- a/libinterp/options-usage.h	Wed Mar 14 16:12:32 2018 +0100
+++ b/libinterp/options-usage.h	Wed Mar 14 08:52:35 2018 -0700
@@ -35,7 +35,7 @@
        [--echo-commands] [--eval CODE] [--exec-path path]\n\
        [--gui] [--help] [--image-path path]\n\
        [--info-file file] [--info-program prog] [--interactive]\n\
-       [--jit-compiler] [--line-editing] [--no-history]\n\
+       [--jit-compiler] [--line-editing] [--no-gui] [--no-history]\n\
        [--no-init-file] [--no-init-path] [--no-line-editing]\n\
        [--no-site-file] [--no-window-system] [--norc] [-p path]\n\
        [--path path] [--persist] [--silent] [--traditional]\n\
@@ -67,7 +67,7 @@
 #define DEBUG_JIT_OPTION 9
 #define JIT_COMPILER_OPTION 10
 #define LINE_EDITING_OPTION 11
-#define NO_GUI_OPTION 12 // ignored since Octave 4.4, remove for 4.8
+#define NO_GUI_OPTION 12
 #define NO_INIT_FILE_OPTION 13
 #define NO_INIT_PATH_OPTION 14
 #define NO_LINE_EDITING_OPTION 15
@@ -145,6 +145,7 @@
   --interactive, -i       Force interactive behavior.\n\
   --jit-compiler          Enable the JIT compiler.\n\
   --line-editing          Force readline use for command-line editing.\n\
+  --no-gui                Disable the graphical user interface.\n\
   --no-history, -H        Don't save commands to the history list\n\
   --no-init-file          Don't read the ~/.octaverc or .octaverc files.\n\
   --no-init-path          Don't initialize function search path.\n\