# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1253466300 0
# Node ID fb0a1e29af2a752979b9fd9bfcf0b5e7e415f94d
# Parent  82212781ad780bb31f22458bc5e6a7a23882f653
(find_handler_clause): Make stack-trace-on-error work in batch mode (bug#4228).

diff -r 82212781ad78 -r fb0a1e29af2a src/ChangeLog
--- a/src/ChangeLog	Sun Sep 20 16:44:50 2009 +0000
+++ b/src/ChangeLog	Sun Sep 20 17:05:00 2009 +0000
@@ -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 -r 82212781ad78 -r fb0a1e29af2a src/eval.c
--- a/src/eval.c	Sun Sep 20 16:44:50 2009 +0000
+++ b/src/eval.c	Sun Sep 20 17:05:00 2009 +0000
@@ -1945,14 +1945,13 @@
 	{
 	  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;
 	}