(find_handler_clause): Make stack-trace-on-error work in batch mode (bug#4228).

diff --git a/src/ChangeLog b/src/ChangeLog
index 566707d3a407d8d5f6b2fb84dabf8f20c036861d..a4d3cb7fd284188738a8389fb82cb2d25a974c5f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-20  Tom Tromey  <tromey@redhat.com>
+
+       * eval.c (find_handler_clause): Make stack-trace-on-error work in
+       batch mode (bug#4228).
+
 2009-09-18  Rob Christie  <robchristie@gmail.com> (tiny change)
 
        * nsmenu.m (EmacsMenu-parseKeyEquiv:): Parse key equivalent more

diff --git a/src/eval.c b/src/eval.c
index 94b6214715ae81c569791bd2ac4cd799802acc01..8d446de09fce2e8d72d0bd064502dd25076aed35 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -1945,14 +1945,13 @@ find_handler_clause (handlers, conditions, sig, data)
        {
          max_lisp_eval_depth += 15;
          max_specpdl_size++;
-#ifdef PROTOTYPES
-         internal_with_output_to_temp_buffer ("*Backtrace*",
-                                              (Lisp_Object (*) (Lisp_Object)) Fbacktrace,
-                                              Qnil);
-#else
-         internal_with_output_to_temp_buffer ("*Backtrace*",
-                                              Fbacktrace, Qnil);
-#endif
+         if (noninteractive)
+           Fbacktrace ();
+         else
+           internal_with_output_to_temp_buffer
+             ("*Backtrace*",
+              (Lisp_Object (*) (Lisp_Object)) Fbacktrace,
+              Qnil);
          max_specpdl_size--;
          max_lisp_eval_depth -= 15;
        }