aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2019-12-07 11:28:05 +0200
committerEli Zaretskii2019-12-07 11:28:05 +0200
commit1161c7d8ec388dc0698e7a398798a4f0e98e0403 (patch)
tree3a8415d9725e40917f2095da5afa79f20c1ffe4d /src
parent2c159da4c9bd342048ec605a04947966a9045bc0 (diff)
downloademacs-1161c7d8ec388dc0698e7a398798a4f0e98e0403.tar.gz
emacs-1161c7d8ec388dc0698e7a398798a4f0e98e0403.zip
Fix fallout from fixing bug#37782
* src/keyboard.c (read_key_sequence): Modify the fix for bug#37782 so that it applies only to keyboard keys, not to other events, such as a new buffer. (Bug#38132)
Diffstat (limited to 'src')
-rw-r--r--src/keyboard.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index 7d3b0244b20..5135fd0bc84 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -9589,9 +9589,7 @@ read_key_sequence (Lisp_Object *keybuf, Lisp_Object prompt,
9589 Fcons (make_lispy_switch_frame (frame), 9589 Fcons (make_lispy_switch_frame (frame),
9590 KVAR (interrupted_kboard, kbd_queue))); 9590 KVAR (interrupted_kboard, kbd_queue)));
9591 } 9591 }
9592 if (FIXNUMP (key) && XFIXNUM (key) == -2) 9592 if (FIXNUMP (key) && XFIXNUM (key) != -2)
9593 mock_input = 0;
9594 else
9595 { 9593 {
9596 /* If interrupted while initializing terminal, we 9594 /* If interrupted while initializing terminal, we
9597 need to replay the interrupting key. See 9595 need to replay the interrupting key. See
@@ -9599,6 +9597,8 @@ read_key_sequence (Lisp_Object *keybuf, Lisp_Object prompt,
9599 mock_input = 1; 9597 mock_input = 1;
9600 keybuf[0] = key; 9598 keybuf[0] = key;
9601 } 9599 }
9600 else
9601 mock_input = 0;
9602 goto replay_entire_sequence; 9602 goto replay_entire_sequence;
9603 } 9603 }
9604 } 9604 }