[Emacs-diffs] emacs/src ChangeLog eval.c

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/09/20 17:05:04

Modified files:
        src            : ChangeLog eval.c 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7760&r2=1.7761
http://cvs.savannah.gnu.org/viewcvs/emacs/src/eval.c?cvsroot=emacs&r1=1.313&r2=1.314

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7760
retrieving revision 1.7761
diff -u -b -r1.7760 -r1.7761
--- ChangeLog   18 Sep 2009 23:54:04 -0000      1.7760
+++ ChangeLog   20 Sep 2009 17:05:00 -0000      1.7761
@@ -1,3 +1,8 @@
+2009-09-20  Tom Tromey  <address@hidden>
+
+       * eval.c (find_handler_clause): Make stack-trace-on-error work in
+       batch mode (bug#4228).
+
 2009-09-18  Rob Christie  <address@hidden> (tiny change)
 
        * nsmenu.m (EmacsMenu-parseKeyEquiv:): Parse key equivalent more

Index: eval.c
===================================================================
RCS file: /sources/emacs/emacs/src/eval.c,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -b -r1.313 -r1.314
--- eval.c      21 Aug 2009 14:53:04 -0000      1.313
+++ eval.c      20 Sep 2009 17:05:02 -0000      1.314
@@ -1945,14 +1945,13 @@
        {
          max_lisp_eval_depth += 15;
          max_specpdl_size++;
-#ifdef PROTOTYPES
-         internal_with_output_to_temp_buffer ("*Backtrace*",
+         if (noninteractive)
+           Fbacktrace ();
+         else
+           internal_with_output_to_temp_buffer
+             ("*Backtrace*",
                                               (Lisp_Object (*) (Lisp_Object)) 
Fbacktrace,
                                               Qnil);
-#else
-         internal_with_output_to_temp_buffer ("*Backtrace*",
-                                              Fbacktrace, Qnil);
-#endif
          max_specpdl_size--;
          max_lisp_eval_depth -= 15;
        }