Mercurial > octave-nkf
changeset 5242:937358a05a18
[project @ 2005-03-24 06:23:10 by jwe]
author | jwe |
---|---|
date | Thu, 24 Mar 2005 06:23:10 +0000 |
parents | ab89f95de831 |
children | 28c69e8c0e85 |
files | src/ChangeLog src/octave.cc |
diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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); }