changeset 20522:779c1d85cf90 stable

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 3be09ebf2105
children 6ef177ddc1ee
files libinterp/octave.cc
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/octave.cc	Sat Sep 05 12:07:42 2015 +0200
+++ b/libinterp/octave.cc	Fri Sep 11 07:38:31 2015 -0400
@@ -714,7 +714,8 @@
 
       octave_print_terse_usage_and_exit ();
     }
-  an_octave_program = (script_file || ! code_to_eval.empty ()) && ! persist;
+  an_octave_program = ((script_file || ! code_to_eval.empty ())
+                       && ! persist && ! traditional);
 
 }