Mercurial > hg > octave-nkf

diff src/input.cc @ 2618:aa667ac18d12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1997-01-23 03:16:28 by jwe]
author jwe
date Thu, 23 Jan 1997 03:16:29 +0000
parents 1e673f0648b5
children 9aeba8e006a4
line wrap: on
line diff
--- a/src/input.cc
+++ b/src/input.cc
@@ -387,7 +387,7 @@
 {
   int do_echo = reading_script_file ?
     (Vecho_executing_commands & ECHO_SCRIPTS)
-      : (Vecho_executing_commands & ECHO_CMD_LINE);
+      : (Vecho_executing_commands & ECHO_CMD_LINE) && ! forced_interactive;
 
   if (do_echo)
     {
@@ -430,7 +430,10 @@
   else
     {
       if (s && *s && (interactive || forced_interactive))
-	fprintf (rl_outstream, s);
+	{
+	  fprintf (rl_outstream, s);
+	  fflush (rl_outstream);
+	}
 
       FILE *curr_stream = rl_instream;
       if (reading_fcn_file || reading_script_file)
@@ -493,11 +496,9 @@
 
       string prompt = decode_prompt_string (ps);
 
-      if (interactive)
-	{
-	  pipe_handler_error_count = 0;
-	  flush_octave_stdout ();
-	}
+      pipe_handler_error_count = 0;
+
+      flush_octave_stdout ();
 
       octave_diary << prompt;