Mercurial > hg > octave-lyh
diff src/oct-hist.cc @ 2205:bd389b53befa
[project @ 1996-05-15 06:15:45 by jwe]
| author | jwe |
|---|---|
| date | Wed, 15 May 1996 06:18:02 +0000 |
| parents | 36903d507b0e |
| children | ced642d8ba6a |
line wrap: on
line diff
--- a/src/oct-hist.cc +++ b/src/oct-hist.cc @@ -48,6 +48,7 @@ #include "file-ops.h" #include "str-vec.h" +#include "defaults.h" #include "defun.h" #include "error.h" #include "input.h" @@ -58,8 +59,8 @@ #include "sysdep.h" #include "toplev.h" #include "unwind-prot.h" -#include "user-prefs.h" #include "utils.h" +#include "variables.h" // Nonzero means input is coming from temporary history file. int input_from_tmp_history_file = 0; @@ -104,9 +105,9 @@ if (file.empty ()) { - if (! home_directory.empty ()) + if (! Vhome_directory.empty ()) { - file = home_directory; + file = Vhome_directory; file.append ("/.octave_hist"); } else @@ -417,7 +418,7 @@ // Call up our favorite editor on the file of commands. - string cmd = user_pref.editor; + string cmd = Veditor; cmd.append (" "); cmd.append (name); @@ -463,9 +464,9 @@ // sense. begin_unwind_frame ("do_edit_history"); - unwind_protect_int (user_pref.echo_executing_commands); + unwind_protect_int (Vecho_executing_commands); unwind_protect_int (input_from_tmp_history_file); - user_pref.echo_executing_commands = ECHO_CMD_LINE; + Vecho_executing_commands = ECHO_CMD_LINE; input_from_tmp_history_file = 1; parse_and_execute (name, 1); @@ -490,9 +491,9 @@ // sense. begin_unwind_frame ("do_run_history"); - unwind_protect_int (user_pref.echo_executing_commands); + unwind_protect_int (Vecho_executing_commands); unwind_protect_int (input_from_tmp_history_file); - user_pref.echo_executing_commands = ECHO_CMD_LINE; + Vecho_executing_commands = ECHO_CMD_LINE; input_from_tmp_history_file = 1; parse_and_execute (name, 1);