Mercurial > octave-nkf

comparison libinterp/octave.cc @ 20522:779c1d85cf90 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Initialize interpreter correctly with script and --traditional (bug #45921) * octave.cc (octave_process_command_line): Ensure an_octave_program is false when --traditional is present (same effect as --persist).
author Mike Miller <mtmiller@octave.org>
date Fri, 11 Sep 2015 07:38:31 -0400
parents e75a0fe1eee2
children b70cc4bd8109
comparison
equal deleted inserted replaced
20518:3be09ebf2105 20522:779c1d85cf90
712 { 712 {
713 error ("--eval \"CODE\" and script file are mutually exclusive options"); 713 error ("--eval \"CODE\" and script file are mutually exclusive options");
714 714
715 octave_print_terse_usage_and_exit (); 715 octave_print_terse_usage_and_exit ();
716 } 716 }
717 an_octave_program = (script_file || ! code_to_eval.empty ()) && ! persist; 717 an_octave_program = ((script_file || ! code_to_eval.empty ())
718 && ! persist && ! traditional);
718 719
719 } 720 }
720 721
721 // EMBEDDED is declared int instead of bool because this function is 722 // EMBEDDED is declared int instead of bool because this function is
722 // declared extern "C". 723 // declared extern "C".