[Emacs-diffs] master ed087fa: Don't signal Quit from 'while-no-input' on TTY frames

[Eli Zaretskii]

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

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

diff --git a/src/keyboard.c b/src/keyboard.c
index 3af487c..c2d8b86 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2551,7 +2551,10 @@ read_char (int commandflag, Lisp_Object map,
       restore_getcjmp (save_jump);
       pthread_sigmask (SIG_SETMASK, &empty_mask, 0);
       unbind_to (jmpcount, Qnil);
-      XSETINT (c, quit_char);
+      /* If we are in while-no-input, don't trigger C-g, as that will
+        quit instead of letting while-no-input do its thing.  */
+      if (!EQ (Vquit_flag, Vthrow_on_input))
+       XSETINT (c, quit_char);
       internal_last_event_frame = selected_frame;
       Vlast_event_frame = internal_last_event_frame;
       /* If we report the quit char as an event,