Mercurial > octave-nkf
changeset 5247:3d5b7114da82
[project @ 2005-03-26 17:56:02 by jwe]
| author | jwe |
|---|---|
| date | Sat, 26 Mar 2005 17:56:02 +0000 |
| parents | 8a4cae8ee7b7 |
| children | e4a97381d57d |
| files | liboctave/ChangeLog liboctave/cmd-edit.cc src/ChangeLog src/input.cc |
| diffstat | 4 files changed, 19 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog Sat Mar 26 00:17:01 2005 +0000 +++ b/liboctave/ChangeLog Sat Mar 26 17:56:02 2005 +0000 @@ -1,3 +1,8 @@ +2005-03-26 John W. Eaton <jwe@octave.org> + + * cmd-edit.cc (do_readline): Wrap call to ::octave_rl_readline + with {BEGIN,END}_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE. + 2005-03-15 John W. Eaton <jwe@octave.org> * Makefile.in (MATRIX_INC): Remove oct-spparms.h from the list.
--- a/liboctave/cmd-edit.cc Sat Mar 26 00:17:01 2005 +0000 +++ b/liboctave/cmd-edit.cc Sat Mar 26 17:56:02 2005 +0000 @@ -36,6 +36,8 @@ #include <unistd.h> #endif +#include "quit.h" + #include "cmd-edit.h" #include "cmd-hist.h" #include "lo-error.h" @@ -192,7 +194,13 @@ eof = false; - char *line = ::octave_rl_readline (prompt.c_str ()); + char *line = 0; + + BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; + + line = ::octave_rl_readline (prompt.c_str ()); + + END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; if (line) {
--- a/src/ChangeLog Sat Mar 26 00:17:01 2005 +0000 +++ b/src/ChangeLog Sat Mar 26 17:56:02 2005 +0000 @@ -1,3 +1,8 @@ +2005-03-26 John W. Eaton <jwe@octave.org> + + * input.cc (gnu_readline): Don't wrap call to command_editor::readline + with {BEGIN,END}_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE. + 2005-03-25 John W. Eaton <jwe@octave.org> * toplev.cc (main_loop): Don't use octave_set_current_context here.
--- a/src/input.cc Sat Mar 26 00:17:01 2005 +0000 +++ b/src/input.cc Sat Mar 26 17:56:02 2005 +0000 @@ -177,12 +177,8 @@ { bool eof; - BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; - retval = command_editor::readline (s, eof); - END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; - if (! eof && retval.empty ()) retval = "\n"; }