# HG changeset patch
# User jwe
# Date 1111645390 0
# Node ID 937358a05a18f091ed41095bc725e2914b1a95dc
# Parent  ab89f95de831f23612a6d968d2eaa62fad3d0046
[project @ 2005-03-24 06:23:10 by jwe]

diff -r ab89f95de831 -r 937358a05a18 src/ChangeLog
--- a/src/ChangeLog	Thu Mar 24 02:45:30 2005 +0000
+++ b/src/ChangeLog	Thu Mar 24 06:23:10 2005 +0000
@@ -1,3 +1,8 @@
+2005-03-24  John W. Eaton  <jwe@octave.org>
+
+	* octave.cc (octave_main): Fix logic in test for exit after
+	evaluating --eval option code.
+
 2005-03-23  John W. Eaton  <jwe@octave.org>
 
 	* DLD-FUNCTIONS/__glpk__.cc (F__glpk__): Require 9 arguments.
diff -r ab89f95de831 -r 937358a05a18 src/octave.cc
--- a/src/octave.cc	Thu Mar 24 02:45:30 2005 +0000
+++ b/src/octave.cc	Thu Mar 24 06:23:10 2005 +0000
@@ -641,7 +641,7 @@
 
       int parse_status = execute_eval_option_code (code_to_eval);
 
-      if (! (persist && remaining_args > 0))
+      if (! (persist || remaining_args > 0))
 	return (parse_status || error_state ? 1 : 0);
     }