diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-07-24 11:10:09 +0200 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-07-25 00:38:34 +0200 |
| commit | 50cc08bf6e6cdc96dcdcbef388cf9cf76a15f81a (patch) | |
| tree | 9cfd5f799262e0ba85d7213113bdb20302196e74 /src/keyboard.c | |
| parent | 2c2b0cd07c143e33af9f7237ef4819c28764a90f (diff) | |
| download | emacs-50cc08bf6e6cdc96dcdcbef388cf9cf76a15f81a.tar.gz emacs-50cc08bf6e6cdc96dcdcbef388cf9cf76a15f81a.tar.bz2 emacs-50cc08bf6e6cdc96dcdcbef388cf9cf76a15f81a.zip | |
‘signal’ no longer returns
Although for decades ‘signal’ has been documented to not return,
a corner case in the Lisp debugger causes ‘signal’ to return.
Remove the corner case and adjust Emacs internals accordingly.
An alternative would be to document the corner case, but this
would complicate the Lisp API unnecessarily. (Bug#24047)
* src/eval.c (signal_or_quit): New function, with most of the
old contents of Fsignal.
(quit): New function, which uses signal_or_quit and which
might return. All keyboard-based callers of Fsignal (Qquit,
Qnil) changed to use this new function instead.
(Fsignal): Use signal_or_quit. Now _Noreturn. All callers
changed.
(xsignal): Move to lisp.h.
* src/lisp.h (xsignal): Now an inline function, as it's now
just an alias for Fsignal.
Diffstat (limited to 'src/keyboard.c')
| -rw-r--r-- | src/keyboard.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 8901ff055e7..ed4968486c3 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -696,7 +696,7 @@ recursive_edit_1 (void) val = command_loop (); if (EQ (val, Qt)) - Fsignal (Qquit, Qnil); + quit (); /* Handle throw from read_minibuf when using minibuffer while it's active but we're in another window. */ if (STRINGP (val)) @@ -7581,7 +7581,7 @@ menu_item_eval_property_1 (Lisp_Object arg) /* If we got a quit from within the menu computation, quit all the way out of it. This takes care of C-] in the debugger. */ if (CONSP (arg) && EQ (XCAR (arg), Qquit)) - Fsignal (Qquit, Qnil); + quit (); return Qnil; } @@ -10407,7 +10407,7 @@ handle_interrupt (bool in_signal_handler) immediate_quit = false; pthread_sigmask (SIG_SETMASK, &empty_mask, 0); saved = gl_state; - Fsignal (Qquit, Qnil); + quit (); gl_state = saved; } else |