aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2019-03-01 12:19:03 +0200
committerEli Zaretskii2019-03-01 12:19:03 +0200
commited087faa9b1f042e0c47c712e737ef75e90c4f8d (patch)
treed5c7aa7a29c03521a955084251601045dfcaa52d /src
parent4b63c21f08679c423200132646d48ffb5f97247a (diff)
downloademacs-ed087faa9b1f042e0c47c712e737ef75e90c4f8d.tar.gz
emacs-ed087faa9b1f042e0c47c712e737ef75e90c4f8d.zip
Don't signal Quit from 'while-no-input' on TTY frames
* src/keyboard.c (read_char): Don't inject quit-char after longjmp if while-no-input is in effect. (Bug#34535)
Diffstat (limited to 'src')
-rw-r--r--src/keyboard.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index 3af487cf070..c2d8b860e4e 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2551,7 +2551,10 @@ read_char (int commandflag, Lisp_Object map,
2551 restore_getcjmp (save_jump); 2551 restore_getcjmp (save_jump);
2552 pthread_sigmask (SIG_SETMASK, &empty_mask, 0); 2552 pthread_sigmask (SIG_SETMASK, &empty_mask, 0);
2553 unbind_to (jmpcount, Qnil); 2553 unbind_to (jmpcount, Qnil);
2554 XSETINT (c, quit_char); 2554 /* If we are in while-no-input, don't trigger C-g, as that will
2555 quit instead of letting while-no-input do its thing. */
2556 if (!EQ (Vquit_flag, Vthrow_on_input))
2557 XSETINT (c, quit_char);
2555 internal_last_event_frame = selected_frame; 2558 internal_last_event_frame = selected_frame;
2556 Vlast_event_frame = internal_last_event_frame; 2559 Vlast_event_frame = internal_last_event_frame;
2557 /* If we report the quit char as an event, 2560 /* If we report the quit char as an event,