[Emacs-diffs] emacs/src keyboard.c

[David Reitter]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     David Reitter <davidswelt>      09/03/12 01:56:59

Modified files:
        src            : keyboard.c 

Log message:
        (parse_menu_item) [HAVE_NS]: treat new event like 
NON_ASCII_KEYSTROKE_EVENT, but set used_mouse_menu.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/keyboard.c?cvsroot=emacs&r1=1.996&r2=1.997

Patches:
Index: keyboard.c
===================================================================
RCS file: /sources/emacs/emacs/src/keyboard.c,v
retrieving revision 1.996
retrieving revision 1.997
diff -u -b -r1.996 -r1.997
--- keyboard.c  12 Feb 2009 18:20:56 -0000      1.996
+++ keyboard.c  12 Mar 2009 01:56:58 -0000      1.997
@@ -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: