From 5b650faa35d1ec890281e2143a14bdcaa836c155 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 20 Sep 2009 17:05:00 +0000 Subject: [PATCH] (find_handler_clause): Make stack-trace-on-error work in batch mode (bug#4228). --- src/ChangeLog | 5 +++++ src/eval.c | 15 +++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 566707d3a40..a4d3cb7fd28 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2009-09-20 Tom Tromey + + * eval.c (find_handler_clause): Make stack-trace-on-error work in + batch mode (bug#4228). + 2009-09-18 Rob Christie (tiny change) * nsmenu.m (EmacsMenu-parseKeyEquiv:): Parse key equivalent more diff --git a/src/eval.c b/src/eval.c index 94b6214715a..8d446de09fc 100644 --- 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; } -- 2.39.5