Mercurial > emacs
changeset 25008:39dd5c98a114
(Fsignal): Reset redisplaying_p to zero.
(Fsignal): Hide busy cursor.
(Feval): Check interrupt_input_block == 0.
(Fsignal): Call to quit_error_check removed.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Wed, 21 Jul 1999 21:43:52 +0000 |
| parents | 618ea9b539f3 |
| children | 5733af0b62ce |
| files | src/eval.c |
| diffstat | 1 files changed, 14 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/eval.c Wed Jul 21 21:43:52 1999 +0000 +++ b/src/eval.c Wed Jul 21 21:43:52 1999 +0000 @@ -1218,8 +1218,9 @@ Lisp_Object string; Lisp_Object real_error_symbol; Lisp_Object combined_data; - - quit_error_check (); + extern int display_busy_cursor_p; + extern int redisplaying_p; + immediate_quit = 0; if (gc_in_progress || waiting_for_input) abort (); @@ -1231,6 +1232,12 @@ else real_error_symbol = error_symbol; +#ifdef HAVE_X_WINDOWS + if (display_busy_cursor_p) + Fx_hide_busy_cursor (Qt); +#endif + redisplaying_p = 0; + /* This hook is used by edebug. */ if (! NILP (Vsignal_hook_function)) call2 (Vsignal_hook_function, error_symbol, data); @@ -1696,6 +1703,11 @@ struct backtrace backtrace; struct gcpro gcpro1, gcpro2, gcpro3; + /* Since Fsignal resets this to 0, it had better be 0 now + or else we have a potential bug. */ + if (interrupt_input_blocked != 0) + abort (); + if (SYMBOLP (form)) { if (EQ (Vmocklisp_arguments, Qt))