[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/eval.c,v
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/src/eval.c,v |
Date: |
Wed, 29 Aug 2007 05:28:27 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Miles Bader <miles> 07/08/29 05:28:10
Index: src/eval.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/eval.c,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -b -r1.286 -r1.287
--- src/eval.c 19 Aug 2007 01:56:15 -0000 1.286
+++ src/eval.c 29 Aug 2007 05:27:57 -0000 1.287
@@ -1280,8 +1280,12 @@
#if HAVE_X_WINDOWS
/* If x_catch_errors was done, turn it off now.
(First we give unbind_to a chance to do that.) */
+#if 0 /* This would disable x_catch_errors after x_connection_closed.
+ * The catch must remain in effect during that delicate
+ * state. --lorentey */
x_fully_uncatch_errors ();
#endif
+#endif
byte_stack_list = catch->byte_stack;
gcprolist = catch->gcpro;
@@ -1458,10 +1462,12 @@
/* 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;
c.val = Qnil;
@@ -1506,10 +1512,12 @@
/* 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;
c.val = Qnil;
@@ -1557,10 +1565,12 @@
/* 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;
c.val = Qnil;