[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/eval.c
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] Changes to emacs/src/eval.c |
Date: |
Sat, 11 Mar 2006 16:00:50 +0000 |
Index: emacs/src/eval.c
diff -u emacs/src/eval.c:1.264 emacs/src/eval.c:1.265
--- emacs/src/eval.c:1.264 Sat Mar 11 15:19:31 2006
+++ emacs/src/eval.c Sat Mar 11 16:00:50 2006
@@ -1259,9 +1259,11 @@
}
while (! last_time);
+#if HAVE_X_WINDOWS
/* If x_catch_errors was done, turn it off now.
(First we give unbind_to a chance to do that.) */
x_fully_uncatch_errors ();
+#endif
byte_stack_list = catch->byte_stack;
gcprolist = catch->gcpro;
@@ -1441,8 +1443,10 @@
/* Since Fsignal will close off all calls to x_catch_errors,
we will get the wrong results if some are not closed now. */
+#if HAVE_X_WINDOWS
if (x_catching_errors ())
abort ();
+#endif
c.tag = Qnil;
c.val = Qnil;
@@ -1487,8 +1491,10 @@
/* Since Fsignal will close off all calls to x_catch_errors,
we will get the wrong results if some are not closed now. */
+#if HAVE_X_WINDOWS
if (x_catching_errors ())
abort ();
+#endif
c.tag = Qnil;
c.val = Qnil;
@@ -1536,8 +1542,10 @@
/* Since Fsignal will close off all calls to x_catch_errors,
we will get the wrong results if some are not closed now. */
+#if HAVE_X_WINDOWS
if (x_catching_errors ())
abort ();
+#endif
c.tag = Qnil;
c.val = Qnil;