]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix fallout from fixing bug#37782
authorEli Zaretskii <eliz@gnu.org>
Sat, 7 Dec 2019 09:28:05 +0000 (11:28 +0200)
committerEli Zaretskii <eliz@gnu.org>
Sat, 7 Dec 2019 09:28:05 +0000 (11:28 +0200)
* 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)

src/keyboard.c

index 7d3b0244b20093a8822da8dcd16fe1718d469ebc..5135fd0bc84bca1bddfc2eeb55f61ade8dac2ca7 100644 (file)
@@ -9589,9 +9589,7 @@ read_key_sequence (Lisp_Object *keybuf, Lisp_Object prompt,
                       Fcons (make_lispy_switch_frame (frame),
                              KVAR (interrupted_kboard, kbd_queue)));
                  }
-                if (FIXNUMP (key) && XFIXNUM (key) == -2)
-                  mock_input = 0;
-                else
+                if (FIXNUMP (key) && XFIXNUM (key) != -2)
                   {
                     /* If interrupted while initializing terminal, we
                        need to replay the interrupting key.  See
@@ -9599,6 +9597,8 @@ read_key_sequence (Lisp_Object *keybuf, Lisp_Object prompt,
                     mock_input = 1;
                     keybuf[0] = key;
                   }
+                else
+                  mock_input = 0;
                goto replay_entire_sequence;
              }
          }