aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2017-01-30 19:08:57 +0200
committerEli Zaretskii2017-01-30 19:08:57 +0200
commitab96c8509736a7ed622916ad2749ff356e520d02 (patch)
tree35099928f66f25abcc1d99cd28a5a9e7503f86d0 /src
parent9c4dfdd1af9f97c6a8d7e922b68a39052116790c (diff)
downloademacs-ab96c8509736a7ed622916ad2749ff356e520d02.tar.gz
emacs-ab96c8509736a7ed622916ad2749ff356e520d02.zip
Avoid crashes on C-g in TTY sessions
* src/keyboard.c (handle_interrupt): Don't quit if waiting_for_input is set, as doing that is "unsafe": it will abort. (Bug#25566)
Diffstat (limited to 'src')
-rw-r--r--src/keyboard.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index d41603b2e50..0c04d95304c 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -10448,7 +10448,7 @@ handle_interrupt (bool in_signal_handler)
10448 /* If executing a function that wants to be interrupted out of 10448 /* If executing a function that wants to be interrupted out of
10449 and the user has not deferred quitting by binding `inhibit-quit' 10449 and the user has not deferred quitting by binding `inhibit-quit'
10450 then quit right away. */ 10450 then quit right away. */
10451 if (immediate_quit && NILP (Vinhibit_quit)) 10451 if (immediate_quit && NILP (Vinhibit_quit) && !waiting_for_input)
10452 { 10452 {
10453 struct gl_state_s saved; 10453 struct gl_state_s saved;
10454 10454