changeset 2434:ced642d8ba6a

[project @ 1996-10-27 04:42:08 by jwe]
author jwe
date Sun, 27 Oct 1996 04:42:08 +0000
parents 3952436ca2c2
children 3be97fe02051
files src/ChangeLog src/oct-hist.cc
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 Sat Oct 26 10:40:05 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* oct-hist.cc (do_history): Move declaration of file inside
+	conditional.
+
 	* defun.h (DEFVAR_INT): Set eternal flag with (svc_fcn != 0)
 	instead of (sv_fcn ? 1 : 0)
 
--- a/src/oct-hist.cc
+++ b/src/oct-hist.cc
@@ -135,11 +135,9 @@
 	  && (argv[i][1] == 'r' || argv[i][1] == 'w'
 	      || argv[i][1] == 'a' || argv[i][1] == 'n'))
 	{
-	  string file;
-
 	  if (i < argc - 1)
 	    {
-	      file = oct_tilde_expand (argv[i+1]);
+	      string file = oct_tilde_expand (argv[i+1]);
 	      octave_command_history.set_file (file);
 	    }
 
@@ -202,7 +200,7 @@
 
 // Read the edited history lines from STREAM and return them
 // one at a time.  This can read unlimited length lines.  The
-//  caller should free the storage.
+// caller should free the storage.
 
 static char *
 edit_history_readline (fstream& stream)