(internal_condition_case_2, internal_condition_case_1)

(internal_condition_case): Reenable abort if x_catching_errors (),
to see if that really happens and why.

diff --git a/src/eval.c b/src/eval.c
index 03923d815aa108aeac3f8d62f08f1a8090e54a4c..8a499ec385161188b66d387312b8a6cbed9e3d32 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -1462,11 +1462,9 @@ internal_condition_case (bfun, handlers, hfun)
 
   /* Since Fsignal will close off all calls to x_catch_errors,
      we will get the wrong results if some are not closed now.  */
-#if 0 /* Fsignal doesn't do that anymore.  --lorentey  */
 #if HAVE_X_WINDOWS
   if (x_catching_errors ())
     abort ();
-#endif
 #endif
 
   c.tag = Qnil;
@@ -1512,11 +1510,9 @@ internal_condition_case_1 (bfun, arg, handlers, hfun)
 
   /* Since Fsignal will close off all calls to x_catch_errors,
      we will get the wrong results if some are not closed now.  */
-#if 0 /* Fsignal doesn't do that anymore.  --lorentey  */
 #if HAVE_X_WINDOWS
   if (x_catching_errors ())
     abort ();
-#endif
 #endif
 
   c.tag = Qnil;
@@ -1565,11 +1561,9 @@ internal_condition_case_2 (bfun, nargs, args, handlers, hfun)
 
   /* Since Fsignal will close off all calls to x_catch_errors,
      we will get the wrong results if some are not closed now.  */
-#if 0 /* Fsignal doesn't do that anymore.  --lorentey  */
 #if HAVE_X_WINDOWS
   if (x_catching_errors ())
     abort ();
-#endif
 #endif
 
   c.tag = Qnil;