From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 16 Jan 2018 01:18:42 +0000 (-0800)
Subject: Fix macOS breakage in make_lispy_event
X-Git-Tag: emacs-27.0.90~5868
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9f22b7d2317eff65897355dcf68ba10d521cfa5a;p=emacs.git

Fix macOS breakage in make_lispy_event

Problem reported by John Wiegley in:
https://lists.gnu.org/r/emacs-devel/2018-01/msg00499.html
* src/keyboard.c (kbd_buffer_get_event) [HAVE_NS]:
Act on used_mouse_menu here...
(make_lispy_event) [HAVE_NS]: ... instead of here.
---

diff --git a/src/keyboard.c b/src/keyboard.c
index 64ad8b2c8fa..75fbe459b2b 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3907,6 +3907,9 @@ kbd_buffer_get_event (KBOARD **kbp,
 #endif
 #if defined (HAVE_NS)
       case NS_TEXT_EVENT:
+	if (used_mouse_menu)
+	  *used_mouse_menu = true;
+	FALLTHROUGH;
 #endif
 #ifdef HAVE_NTGUI
       case END_SESSION_EVENT:
@@ -5463,8 +5466,6 @@ make_lispy_event (struct input_event *event)
 
 #ifdef HAVE_NS
     case NS_TEXT_EVENT:
-      if (used_mouse_menu)
-        *used_mouse_menu = true;
       return list1 (intern (event->code == KEY_NS_PUT_WORKING_TEXT
                             ? "ns-put-working-text"
                             : "ns-unput-working-text"));