* eval.c (clobbered_eassert): New macro.

(internal_catch, internal_condition_case)
(internal_condition_case_1, internal_condition_case_2)
(internal_condition_case_n): Use it instead of eassert
when the argument contains locals clobbered by longjmp.
Don't use clobbered locals outside of clobbered_eassert.
(internal_lisp_condition_case): Use a volatile variable
to work around a local variable's getting clobbered.

1 files changed, 11 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4b1bfc75187..8a0d8863548 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2013-10-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * eval.c (clobbered_eassert): New macro.
+        (internal_catch, internal_condition_case)
+        (internal_condition_case_1, internal_condition_case_2)
+        (internal_condition_case_n): Use it instead of eassert
+        when the argument contains locals clobbered by longjmp.
+        Don't use clobbered locals outside of clobbered_eassert.
+        (internal_lisp_condition_case): Use a volatile variable
+        to work around a local variable's getting clobbered.
+
 2013-10-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * lisp.h (struct handler): Merge struct handler and struct catchtag.