Mercurial > octave

comparison libinterp/octave.cc @ 15473:457a2ff2a71b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
set Vinfo_file and Vinfo_program variables directly from command line options * octave.cc (octave_process_command_line): Set Vinfo_file and Vinfo_program directly. (octave_initialize_interpreter): Don't call bind_internal_variable to set Vinfo_file or Vinfo_program. * defaults.cc (set_default_info_file): Don't set Vinfo_file unless it is empty. (set_default_info_prog): Don't set Vinfo_program unless it is empty.
author John W. Eaton <jwe@octave.org>
date Wed, 03 Oct 2012 02:17:28 -0400
parents c8c828276b69
children 1865feebb415
comparison
equal deleted inserted replaced
15472:c8c828276b69 15473:457a2ff2a71b
50 #include "Cell.h" 50 #include "Cell.h"
51 #include "defun.h" 51 #include "defun.h"
52 #include "display.h" 52 #include "display.h"
53 #include "error.h" 53 #include "error.h"
54 #include "file-io.h" 54 #include "file-io.h"
55 #include "help.h"
55 #include "input.h" 56 #include "input.h"
56 #include "lex.h" 57 #include "lex.h"
57 #include "load-path.h" 58 #include "load-path.h"
58 #include "octave.h" 59 #include "octave.h"
59 #include "oct-conf.h" 60 #include "oct-conf.h"
813 image_path = optarg; 814 image_path = optarg;
814 break; 815 break;
815 816
816 case INFO_FILE_OPTION: 817 case INFO_FILE_OPTION:
817 if (optarg) 818 if (optarg)
818 info_file = optarg; 819 Vinfo_file = optarg;
819 break; 820 break;
820 821
821 case INFO_PROG_OPTION: 822 case INFO_PROG_OPTION:
822 if (optarg) 823 if (optarg)
823 info_program = optarg; 824 Vinfo_program = optarg;
824 break; 825 break;
825 826
826 case JIT_DEBUG_OPTION: 827 case JIT_DEBUG_OPTION:
827 jit_debug_option = true; 828 jit_debug_option = true;
828 break; 829 break;
959 if (! exec_path.empty ()) 960 if (! exec_path.empty ())
960 set_exec_path (exec_path); 961 set_exec_path (exec_path);
961 962
962 if (! image_path.empty ()) 963 if (! image_path.empty ())
963 set_image_path (image_path); 964 set_image_path (image_path);
964
965 if (! info_file.empty ())
966 bind_internal_variable ("info_file", info_file);
967
968 if (! info_program.empty ())
969 bind_internal_variable ("info_program", info_program);
970 965
971 if (no_window_system) 966 if (no_window_system)
972 display_info::no_window_system (); 967 display_info::no_window_system ();
973 968
974 if (! texi_macros_file.empty ()) 969 if (! texi_macros_file.empty ())