comparison src/variables.cc @ 1907:8c6cea97eb80

[project @ 1996-02-10 01:12:46 by jwe]
author jwe
date Sat, 10 Feb 1996 01:17:59 +0000
parents e62277bf5fe0
children 1d4f67de06f4
comparison
equal deleted inserted replaced
1906:fb2b7ebf77e4 1907:8c6cea97eb80
670 fseek (ffile, pos, SEEK_SET); 670 fseek (ffile, pos, SEEK_SET);
671 671
672 return status; 672 return status;
673 } 673 }
674 674
675 static void
676 restore_command_history (void *)
677 {
678 octave_command_history.ignore_entries (! user_pref.saving_history);
679 }
680
675 static int 681 static int
676 parse_fcn_file (int exec_script, const string& ff) 682 parse_fcn_file (int exec_script, const string& ff)
677 { 683 {
678 begin_unwind_frame ("parse_fcn_file"); 684 begin_unwind_frame ("parse_fcn_file");
679 685
705 711
706 string tmp_help_txt = gobble_leading_white_space (ffile, 0); 712 string tmp_help_txt = gobble_leading_white_space (ffile, 0);
707 713
708 if (is_function_file (ffile)) 714 if (is_function_file (ffile))
709 { 715 {
716 // XXX FIXME XXX -- we shouldn't need both the
717 // octave_command_history object and the
718 // user_pref.saving_history variable...
719 octave_command_history.ignore_entries ();
720
721 add_unwind_protect (restore_command_history, 0);
722
710 unwind_protect_int (user_pref.echo_executing_commands); 723 unwind_protect_int (user_pref.echo_executing_commands);
711 unwind_protect_int (user_pref.saving_history); 724 unwind_protect_int (user_pref.saving_history);
712 unwind_protect_int (reading_fcn_file); 725 unwind_protect_int (reading_fcn_file);
713 unwind_protect_int (input_from_command_line_file); 726 unwind_protect_int (input_from_command_line_file);
714 727