# HG changeset patch
# User jwe
# Date 1111859762 0
# Node ID 3d5b7114da820cb6a006a4fd9518fa417f8e1047
# Parent  8a4cae8ee7b70dcd97f848d1a82687ecebd38e67
[project @ 2005-03-26 17:56:02 by jwe]

diff -r 8a4cae8ee7b7 -r 3d5b7114da82 liboctave/ChangeLog
--- 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.
diff -r 8a4cae8ee7b7 -r 3d5b7114da82 liboctave/cmd-edit.cc
--- 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)
     {
diff -r 8a4cae8ee7b7 -r 3d5b7114da82 src/ChangeLog
--- 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.
diff -r 8a4cae8ee7b7 -r 3d5b7114da82 src/input.cc
--- 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";
     }