(parse_menu_item) [HAVE_NS]: treat new event like NON_ASCII_KEYSTROKE_EVENT, but...

diff --git a/src/keyboard.c b/src/keyboard.c
index 9f7648563c0cf94981987caac1d808909b5992f3..5d3ae421d0fdd9d0b87fd93b487884a943cb602d 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4158,6 +4158,7 @@ kbd_buffer_get_event (kbp, used_mouse_menu, end_time)
           else
             obj = Fcons (intern ("ns-unput-working-text"), Qnil);
          kbd_fetch_ptr = event + 1;
+         *used_mouse_menu = 1;
         }
 #endif
 
@@ -4312,6 +4313,11 @@ kbd_buffer_get_event (kbp, used_mouse_menu, end_time)
                      || event->kind == TOOL_BAR_EVENT))
                *used_mouse_menu = 1;
 #endif
+#ifdef HAVE_NS
+             /* certain system events are non-key events */
+             if (event->kind == NS_NONKEY_EVENT)
+               *used_mouse_menu = 1;
+#endif
 
              /* Wipe out this event, to catch bugs.  */
              clear_event (event);
@@ -5552,6 +5558,12 @@ make_lispy_event (event)
        return lispy_c;
       }
 
+#ifdef HAVE_NS
+      /* NS_NONKEY_EVENTs are just like NON_ASCII_KEYSTROKE_EVENTs,
+        except that they are non-key events (last-nonmenu-event is nil). */
+    case NS_NONKEY_EVENT:
+#endif
+
       /* A function key.  The symbol may need to have modifier prefixes
         tacked onto it.  */
     case NON_ASCII_KEYSTROKE_EVENT: