Mercurial > octave-nkf
changeset 6305:48f8af442b8a
[project @ 2007-02-14 22:16:53 by jwe]
| author | jwe |
|---|---|
| date | Wed, 14 Feb 2007 22:16:54 +0000 |
| parents | 78a3254741b2 |
| children | 1ef6ac757951 |
| files | src/ChangeLog src/input.cc |
| diffstat | 2 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Feb 14 21:22:59 2007 +0000 +++ b/src/ChangeLog Wed Feb 14 22:16:54 2007 +0000 @@ -1,3 +1,7 @@ +2007-02-14 John W. Eaton <jwe@octave.org> + + * input.cc (interactive_input): Check error_state after call to feval. + 2007-02-10 John W. Eaton <jwe@octave.org> * oct-stream.cc (octave_stream::rewind): Call seek (0, SEEK_SET)
--- a/src/input.cc Wed Feb 14 21:22:59 2007 +0000 +++ b/src/input.cc Wed Feb 14 22:16:54 2007 +0000 @@ -219,7 +219,13 @@ { feval ("drawnow"); + // We set Vdrawnow_requested to false even if there is an error + // in drawnow so that the error doesn't reappear at every prompt. + Vdrawnow_requested = false; + + if (error_state) + return "\n"; } return gnu_readline (s, force_readline);