Mercurial > emacs
changeset 69399:947598ed954a
(unwind_to_catch): Call x_fully_uncatch_errors only if HAVE_X_WINDOWS.
(internal_condition_case, internal_condition_case_1)
(internal_condition_case_2): Call x_catching_errors only if HAVE_X_WINDOWS.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sat, 11 Mar 2006 16:00:50 +0000 |
| parents | 15b9fd17967e |
| children | fde63ac8d588 |
| files | src/eval.c |
| diffstat | 1 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/eval.c Sat Mar 11 15:46:24 2006 +0000 +++ b/src/eval.c Sat Mar 11 16:00:50 2006 +0000 @@ -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;