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/term.c | |
| parent | 2c2b0cd07c143e33af9f7237ef4819c28764a90f (diff) | |
| download | emacs-50cc08bf6e6cdc96dcdcbef388cf9cf76a15f81a.tar.gz | |
‘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/term.c')
| -rw-r--r-- | src/term.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/term.c b/src/term.c index 81908b370a5..d54ff115f9d 100644 --- a/src/term.c +++ b/src/term.c @@ -3759,7 +3759,7 @@ tty_menu_show (struct frame *f, int x, int y, int menuflags, /* Make "Cancel" equivalent to C-g unless FOR_CLICK (which means the menu was invoked with a mouse event as POSITION). */ if (!(menuflags & MENU_FOR_CLICK)) - Fsignal (Qquit, Qnil); + quit (); break; } |