[Emacs-diffs] master 9f22b7d: Fix macOS breakage in make_lispy_event

[Paul Eggert]

branch: master
commit 9f22b7d2317eff65897355dcf68ba10d521cfa5a
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    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.
---
 src/keyboard.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/keyboard.c b/src/keyboard.c
index 64ad8b2..75fbe45 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"));