octave-nkf: src/input.cc comparison

[project @ 2006-05-26 21:41:32 by jwe]

comparison

equal deleted inserted replaced

-:b0d4ff99a0c5
+:5e41e06f6a78
 #include "dirfns.h"
 #include "error.h"
 #include "gripes.h"
 #include "help.h"
 #include "input.h"
+#include "load-path.h"
 #include "oct-map.h"
 #include "oct-hist.h"
 #include "toplev.h"
 #include "oct-obj.h"
 #include "pager.h"
 //
 // more than one state can be active at once.
 int Vecho_executing_commands = ECHO_OFF;
 // The time we last printed a prompt.
-octave_time Vlast_prompt_time;
+octave_time Vlast_prompt_time = 0.0;
 // Character to append after successful command-line completion attempts.
 static char Vcompletion_append_char = ' ';
 // Global pointer for eval().
 {
 OCTAVE_QUIT;
 std::string retval;
-Vlast_prompt_time.stamp ();
 if ((interactive || forced_interactive)
-&& (! (reading_fcn_file || reading_script_file)))
+&& (! (reading_fcn_file
+	     || reading_script_file
+	     || input_from_startup_file
+	     || input_from_command_line_file)))
 {
 std::string ps = (promptflag > 0) ? VPS1 : VPS2;
 std::string prompt = command_editor::decode_prompt_string (ps);
 flush_octave_stdout ();
 octave_diary << prompt;
+Vlast_prompt_time.stamp ();
 retval = gnu_readline (prompt);
+// There is no need to update the load_path cache if there is no
+// user input.
+if (! retval.empty ())
+	load_path::update ();
 }
 else
 retval = gnu_readline ("");
 current_input_line = retval;

Mercurial > octave-nkf