diff src/oct-parse.yy @ 12989:00235a6446da

eliminate duplication of internal variables controlling command history * oct-hist.h, oct-hist.cc, input.cc, toplev.cc, oct-parse.yy (Vhistory_file, Vhistory_size, Vhistory_control, Vsaving_history): Delete variables and all uses. * oct-hist.cc (default_history_control): Delete.
author John W. Eaton <jwe@octave.org>
date Tue, 23 Aug 2011 17:08:51 -0400
parents b80b18f537ca
children 50db905c3cf1
line wrap: on
line diff
--- a/src/oct-parse.yy	Tue Aug 23 14:00:02 2011 -0500
+++ b/src/oct-parse.yy	Tue Aug 23 17:08:51 2011 -0400
@@ -3471,18 +3471,11 @@
   parsing_subfunctions = false;
   endfunction_found = false;
 
-  // The next four lines must be in this order.
-  frame.add_fcn (command_history::ignore_entries, ! Vsaving_history);
-
-  // FIXME -- we shouldn't need both the
-  // command_history object and the
-  // Vsaving_history variable...
+  frame.add_fcn (command_history::ignore_entries,
+                 command_history::ignoring_entries ());
+
   command_history::ignore_entries ();
 
-  frame.protect_var (Vsaving_history);
-
-  Vsaving_history = false;
-
   FILE *ffile = get_input_from_file (ff, 0);
 
   frame.add_fcn (safe_fclose, ffile);