# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1366296314 14400
# Node ID 63b144e6a3d0735dd8ba795f4f35e60b2d5919ce
# Parent  8ea8df0747e93dfcaf272a157af4b47deb98bb51
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.

diff --git a/libinterp/interpfcn/defaults.cc b/libinterp/interpfcn/defaults.cc
--- a/libinterp/interpfcn/defaults.cc
+++ b/libinterp/interpfcn/defaults.cc
@@ -463,8 +463,6 @@
   set_site_defaults_file ();
 
   set_built_in_docstrings_file ();
-
-  set_default_prompts ();
 }
 
 DEFUN (EDITOR, args, nargout,
diff --git a/libinterp/octave.cc b/libinterp/octave.cc
--- 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 ();
diff --git a/src/main-cli.cc b/src/main-cli.cc
--- a/src/main-cli.cc
+++ b/src/main-cli.cc
@@ -33,6 +33,10 @@
 {
   octave_process_command_line (argc, argv);
 
+  sysdep_init ();
+
+  install_defaults ();
+
   octave_initialize_interpreter (argc, argv, 0);
 
   return octave_execute_interpreter ();
diff --git a/src/main.cc b/src/main.cc
--- a/src/main.cc
+++ b/src/main.cc
@@ -36,6 +36,10 @@
 
   octave_process_command_line (argc, argv);
 
+  sysdep_init ();
+
+  install_defaults ();
+
   if (octave_starting_gui ())
     retval = octave_start_gui (argc, argv);
   else