From: Logan Perkins <logan@lp-programming.com>
Date: Wed, 21 Jul 2021 15:56:20 +0000 (+0200)
Subject: Make input of multi-key inputs in different emacsclients more logical
X-Git-Tag: emacs-28.0.90~1762
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=903ecd7bea7d8f99a7dc84150728219283d79bf0;p=emacs.git

Make input of multi-key inputs in different emacsclients more logical

* src/keyboard.c (read_key_sequence): Don't continue the input of
multi-key commands in one emacsclient in another (bug#39687).
---

diff --git a/src/keyboard.c b/src/keyboard.c
index 38118071a80..820229cf8fe 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -9619,17 +9619,23 @@ read_key_sequence (Lisp_Object *keybuf, Lisp_Object prompt,
 		      (interrupted_kboard,
 		       Fcons (make_lispy_switch_frame (frame),
 			      KVAR (interrupted_kboard, kbd_queue)));
+                   mock_input = 0;
+                 }
+               else
+                 {
+                   if (FIXNUMP (key) && XFIXNUM (key) != -2)
+                     {
+                       /* If interrupted while initializing terminal, we
+                          need to replay the interrupting key.  See
+                          Bug#5095 and Bug#37782.  */
+                       mock_input = 1;
+                       keybuf[0] = key;
+                     }
+                   else
+                     {
+                       mock_input = 0;
+                     }
 		  }
-                if (FIXNUMP (key) && XFIXNUM (key) != -2)
-                  {
-                    /* If interrupted while initializing terminal, we
-                       need to replay the interrupting key.  See
-                       Bug#5095 and Bug#37782.  */
-                    mock_input = 1;
-                    keybuf[0] = key;
-                  }
-                else
-                  mock_input = 0;
 		goto replay_entire_sequence;
 	      }
 	  }