From: Olaf Rogalsky <olaf.rogalsky@t-online.de>
Date: Mon, 20 Nov 2017 17:47:21 +0000 (-0500)
Subject: * src/keyboard.c: Make xterm-mouse clicks on mode-line work
X-Git-Tag: emacs-27.0.90~6152
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=51a5ccbe850da9fa5b58cee169fd5dbe8917f4e7;p=emacs.git

* src/keyboard.c: Make xterm-mouse clicks on mode-line work

Copyright-paperwork-exempt: yes

(read_key_sequence): Recompute first_event
after replay_sequence, since it might have changed (bug#29104).
---

diff --git a/src/keyboard.c b/src/keyboard.c
index 399149ae978..6b7a6bfa743 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -8919,7 +8919,6 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
   ptrdiff_t keys_start;
 
   Lisp_Object current_binding = Qnil;
-  Lisp_Object first_event = Qnil;
 
   /* Index of the first key that has no binding.
      It is useless to try fkey.start larger than that.  */
@@ -9029,6 +9028,7 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
 
   starting_buffer = current_buffer;
   first_unbound = bufsize + 1;
+  Lisp_Object first_event = mock_input > 0 ? keybuf[0] : Qnil;
 
   /* Build our list of keymaps.
      If we recognize a function key and replace its escape sequence in