# HG changeset patch
# User David Reitter <david.reitter@gmail.com>
# Date 1236823018 0
# Node ID af863de451841223bc4668efa9a9d54142b6f1bf
# Parent  23b9944ae977ff28451262a606c89973e3c7afb1
(parse_menu_item) [HAVE_NS]: treat new event like NON_ASCII_KEYSTROKE_EVENT, but set used_mouse_menu.

diff -r 23b9944ae977 -r af863de45184 src/keyboard.c
--- a/src/keyboard.c	Thu Mar 12 01:55:52 2009 +0000
+++ b/src/keyboard.c	Thu Mar 12 01:56:58 2009 +0000
@@ -4158,6 +4158,7 @@
           else
             obj = Fcons (intern ("ns-unput-working-text"), Qnil);
 	  kbd_fetch_ptr = event + 1;
+	  *used_mouse_menu = 1;
         }
 #endif
 
@@ -4312,6 +4313,11 @@
 		      || 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 @@
 	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: