emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master ab96c85: Avoid crashes on C-g in TTY sessions


From: Eli Zaretskii
Subject: [Emacs-diffs] master ab96c85: Avoid crashes on C-g in TTY sessions
Date: Mon, 30 Jan 2017 17:09:54 +0000 (UTC)

branch: master
commit ab96c8509736a7ed622916ad2749ff356e520d02
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    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)
---
 src/keyboard.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/keyboard.c b/src/keyboard.c
index d41603b..0c04d95 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -10448,7 +10448,7 @@ handle_interrupt (bool in_signal_handler)
       /* If executing a function that wants to be interrupted out of
         and the user has not deferred quitting by binding `inhibit-quit'
         then quit right away.  */
-      if (immediate_quit && NILP (Vinhibit_quit))
+      if (immediate_quit && NILP (Vinhibit_quit) && !waiting_for_input)
        {
          struct gl_state_s saved;
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]