Mercurial > hg > octave-lyh

diff libinterp/octave.cc @ 16540:63b144e6a3d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
partially undo the changes in 9bc1f8278966 * octave.cc (octave_initialize_interpreter): Call set_default_prompts. Don't call sysdep_init or install_defaults. (octave_main): Call sysdep_init and install_defaults. * defaults.cc (install_defaults): Don't call set_default_prompts. * main.cc (main): Call sysdep_init and install_defaults. * main-cli.cc (main): Likewise.
author John W. Eaton <jwe@octave.org>
date Thu, 18 Apr 2013 10:45:14 -0400
parents 9bc1f8278966
children 2ed5bc680c71 f8f35ddc49a2
line wrap: on
line diff
--- a/libinterp/octave.cc
+++ b/libinterp/octave.cc
@@ -647,6 +647,10 @@
 {
   octave_process_command_line (argc, argv);
 
+  sysdep_init ();
+
+  install_defaults ();
+
   octave_initialize_interpreter (argc, argv, embedded);
 
   return octave_execute_interpreter ();
@@ -848,9 +852,7 @@
 
   octave_thread::init ();
 
-  sysdep_init ();
-
-  install_defaults ();
+  set_default_prompts ();
 
   if (traditional)
     maximum_braindamage ();