Mercurial > octave-nkf

diff src/main.cc @ 15262:ad1a980b0cb5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
install default values before initializing interpreter (bug #37161) * octave.cc (octave_initialize_interpreter): Don't call install_defaults here. (octave_main): Call install_defaults here. * main.cc (main): Likewise. * main-cli.cc (main): Likewise. * src/Makefile.am (AM_CPPFLAGS): Include -I$(srcdir)/../libcruft/misc, -I$(srcdir)/../liboctave, and -I$(top_builddir)/libinterp/interpfcn in the list.
author John W. Eaton <jwe@octave.org>
date Thu, 30 Aug 2012 12:05:04 -0400
parents a44e4a08fc55
children 9ede91b3872b
line wrap: on
line diff
--- a/src/main.cc	Thu Aug 30 15:53:07 2012 +0100
+++ b/src/main.cc	Thu Aug 30 12:05:04 2012 -0400
@@ -24,8 +24,9 @@
 #include <config.h>
 #endif
 
-#include <octave.h>
-#include <octave-gui.h>
+#include "defaults.h"
+#include "octave.h"
+#include "octave-gui.h"
 
 int
 main (int argc, char **argv)
@@ -34,6 +35,8 @@
 
   octave_process_command_line (argc, argv);
 
+  install_defaults ();
+
   if (octave_starting_gui ())
     retval = octave_start_gui (argc, argv);
   else