Mercurial > octave-nkf
changeset 5335:a892ee7ac114
[project @ 2005-05-02 20:33:48 by jwe]
| author | jwe |
|---|---|
| date | Mon, 02 May 2005 20:33:48 +0000 |
| parents | f9afe97d6d14 |
| children | 6ba182a85dea |
| files | src/ChangeLog src/error.cc |
| diffstat | 2 files changed, 14 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon May 02 18:56:32 2005 +0000 +++ b/src/ChangeLog Mon May 02 20:33:48 2005 +0000 @@ -1,5 +1,8 @@ 2005-05-02 John W. Eaton <jwe@octave.org> + * error.cc (Flasterr): Don't access argv if an error occurs when + creating it. + * mkgendoc (main): Print header message. 2005-05-02 Bill Denney <denney@seas.upenn.edu>
--- a/src/error.cc Mon May 02 18:56:32 2005 +0000 +++ b/src/error.cc Mon May 02 20:33:48 2005 +0000 @@ -702,12 +702,18 @@ int argc = args.length () + 1; - string_vector argv = args.make_argv ("lasterr"); + if (argc == 1 || argc == 2) + { + string_vector argv = args.make_argv ("lasterr"); - if (argc == 1) - retval(0) = Vlast_error_message; - else if (argc == 2) - Vlast_error_message = argv(1); + if (! error_state) + { + if (argc == 1) + retval(0) = Vlast_error_message; + else + Vlast_error_message = argv(1); + } + } else print_usage ("lasterr");