(find_handler_clause): Give up on debugger if INPUT_BLOCKED_P.

2 files changed, 20 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8d2a22d1809..cfbe21a77d4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,20 @@
+2006-09-08  Richard Stallman  <rms@gnu.org>
+
+        * eval.c (find_handler_clause): Give up on debugger if INPUT_BLOCKED_P.
+
+        * casetab.c (init_casetab_once): Call set_case_table.
+
+        * emacs.c (shut_down_emacs): Set inhibit_sentinels.
+
+        * process.c (inhibit_sentinels): New variable.
+        (exec_sentinel): Test inhibit_sentinels.
+        (init_process): Initialize it.
+
+        * process.h (inhibit_sentinels): Add decl.
+
+        * search.c (looking_at_1, string_match_1, search_command):
+        Make syntax table's canon table point to eqv table.
+
 2006-09-08  Andreas Schwab  <schwab@suse.de>
 
         * print.c (strout): Fix whitespace.
diff --git a/src/eval.c b/src/eval.c
index 5f3bd46c4dc..dbd30eac201 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1904,6 +1904,9 @@ find_handler_clause (handlers, conditions, sig, data, debugger_value_ptr)
           max_specpdl_size--;
         }
       if (! no_debugger
+          /* Don't try to run the debugger with interrupts blocked.
+             The editing loop would return anyway.  */
+          && ! INPUT_BLOCKED_P
           && (EQ (sig_symbol, Qquit)
               ? debug_on_quit
               : wants_debugger (Vdebug_on_error, conditions))