Mercurial > octave-nkf

diff libinterp/octave.cc @ 16528:9bc1f8278966

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow GUI to customize prompts at startup * octave-link.h (octave_link::set_default_prompts, octave_link::do_set_default_prompts): New functions. * octave-qt-link.h, octave-qt-link.cc (octave_qt_link::do_set_default_prompts): New function. * input.h, input.cc (set_default_prompts): New function. * defaults.cc (install_defaults): Call set_default_prompts. * octave.cc (traditional): New static variable. (octave_process_command_line): Set it and defer calling maximum_braindamage until after defaults have been set. (octave_initialize_interpreter): Call sysdep_init and install_defaults here. (octave_main): Not here. * main-cli.cc (main): Or here. * main.cc (main): Or here.
author John W. Eaton <jwe@octave.org>
date Wed, 17 Apr 2013 00:17:21 -0400
parents 8b783661e03f
children 63b144e6a3d0
line wrap: on
line diff
--- a/libinterp/octave.cc	Tue Apr 16 16:56:40 2013 -0400
+++ b/libinterp/octave.cc	Wed Apr 17 00:17:21 2013 -0400
@@ -178,6 +178,9 @@
 // If TRUE, the GUI should be started.
 static bool start_gui = false;
 
+// If TRUE use traditional settings (--traditional)
+static bool traditional = false;
+
 // Long options.  See the comments in getopt.h for the meanings of the
 // fields in this structure.
 #define BUILT_IN_DOCSTRINGS_FILE_OPTION 1
@@ -644,10 +647,6 @@
 {
   octave_process_command_line (argc, argv);
 
-  sysdep_init ();
-
-  install_defaults ();
-
   octave_initialize_interpreter (argc, argv, embedded);
 
   return octave_execute_interpreter ();
@@ -814,7 +813,7 @@
           break;
 
         case TRADITIONAL_OPTION:
-          maximum_braindamage ();
+          traditional = true;
           break;
 
         default:
@@ -849,6 +848,13 @@
 
   octave_thread::init ();
 
+  sysdep_init ();
+
+  install_defaults ();
+
+  if (traditional)
+    maximum_braindamage ();
+
   init_signals ();
 
   octave_ieee_init ();