(find_handler_clause): Temporarily increase max-lisp-eval-depth while

printing the backtrace buffer, to guarantee that help-mode code can
run.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0049b350f44b90d6aec1bc7c68a9f972efacfa20..43d5caa4eaff901becc921578404299485027651 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-27  Chong Yidong  <cyd@stupidchicken.com>
+
+       * eval.c (find_handler_clause): Temporarily increase
+       max-lisp-eval-depth while printing the backtrace buffer, to
+       guarantee that help-mode code can run.
+
 2008-08-27  Eli Zaretskii  <eliz@gnu.org>
 
        * msdos.c (Fmsdos_remember_default_colors): Don't reverse frame

diff --git a/src/eval.c b/src/eval.c
index 083cea889f5615027075a23ea5c04b1514217825..6531b977990c3bae625834ea78a5b3119644a3b3 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -1941,16 +1941,18 @@ find_handler_clause (handlers, conditions, sig, data)
     {
       if (!NILP (sig) && wants_debugger (Vstack_trace_on_error, conditions))
        {
+         max_lisp_eval_depth += 15;
          max_specpdl_size++;
-    #ifdef PROTOTYPES
+#ifdef PROTOTYPES
          internal_with_output_to_temp_buffer ("*Backtrace*",
                                               (Lisp_Object (*) (Lisp_Object)) Fbacktrace,
                                               Qnil);
-    #else
+#else
          internal_with_output_to_temp_buffer ("*Backtrace*",
                                               Fbacktrace, Qnil);
-    #endif
+#endif
          max_specpdl_size--;
+         max_lisp_eval_depth -= 15;
        }
 
       if (!debugger_considered)