changeset 5193:40d1282dda33

[project @ 2005-03-04 14:09:49 by jwe]
author jwe
date Fri, 04 Mar 2005 14:09:49 +0000
parents a6ad58b1c46f
children cb213ce19827
files scripts/ChangeLog src/ChangeLog src/octave.cc
diffstat 3 files changed, 17 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -2,6 +2,13 @@
 
 	* plot/clg.m: New file.
 
+2005-03-03  John W. Eaton  <jwe@octave.org>
+
+	* general/isequal.m, general/sortrows.m, set/ismember.m,
+	set/setdiff.m, strings/str2double.m, strings/strmatch.m,
+	strings/strcmpi.m:
+	New files from Octave-forge.  Adapt to Octave coding standards.
+
 2005-03-03  Paul Kienzle  <pkienzle@users.sf.net>
 
 	* statistics/distributions/binomial_pdf.m: Extend the feasible
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-04  John W. Eaton  <jwe@octave.org>
+
+	* octave.cc (octave_main): Concatenate all --eval arguments.
+
 2005-03-03  John W. Eaton  <jwe@octave.org>
 
 	* input.cc (input_from_command_line_file): Move definition here.
--- a/src/octave.cc
+++ b/src/octave.cc
@@ -538,7 +538,12 @@
 
 	case EVAL_OPTION:
 	  if (args.optarg ())
-	    code_to_eval = args.optarg ();
+	    {
+	      if (code_to_eval.empty ())
+		code_to_eval = args.optarg ();
+	      else
+		code_to_eval += std::string (" ") + args.optarg ();
+	    }
 	  break;
 
 	case EXEC_PATH_OPTION: