Mercurial > octave

diff src/parse.y @ 168:a500c60e8f23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1993-10-19 05:24:44 by jwe]
author jwe
date Tue, 19 Oct 1993 05:27:59 +0000
parents 7849db4b6dbc
children 49ab724d0a32
line wrap: on
line diff
--- a/src/parse.y	Tue Oct 19 05:14:27 1993 +0000
+++ b/src/parse.y	Tue Oct 19 05:27:59 1993 +0000
@@ -34,6 +34,7 @@
 
 #include "error.h"
 #include "variables.h"
+#include "octave-hist.h"
 #include "user-prefs.h"
 #include "input.h"
 #include "utils.h"
@@ -486,7 +487,7 @@
 		      (sr, $1->line (), $1->column ());
 		    tree_simple_assignment_expression *expr =
 		      new tree_simple_assignment_expression
-			(id, $3, $2->line () , $2->column ());
+			(id, $3, $2->line (), $2->column ());
 		    expr->eval (0);
 		  }
 		| global_decl1 optcomma NAME
@@ -908,7 +909,8 @@
 		      }
 		    else
 		      {
-			if (reading_script_file
+			if (! input_from_tmp_history_file
+			    && reading_script_file
 			    && strcmp (curr_m_file_name, id_name) == 0)
 			  warning ("function `%s' defined within\
  script file `%s.m'", id_name, curr_m_file_name);