[Emacs-diffs] emacs/src keyboard.c

[Adrian Robert]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Adrian Robert <arobert> 09/06/08 08:28:10

Modified files:
        src            : keyboard.c 

Log message:
        keyboard.c (kbd_buffer_get_event): Null-check used_mouse_menu.

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

Patches:
Index: keyboard.c
===================================================================
RCS file: /sources/emacs/emacs/src/keyboard.c,v
retrieving revision 1.1005
retrieving revision 1.1006
diff -u -b -r1.1005 -r1.1006
--- keyboard.c  6 May 2009 01:30:23 -0000       1.1005
+++ keyboard.c  8 Jun 2009 08:28:09 -0000       1.1006
@@ -4162,6 +4162,7 @@
           else
             obj = Fcons (intern ("ns-unput-working-text"), Qnil);
          kbd_fetch_ptr = event + 1;
+          if (used_mouse_menu)
          *used_mouse_menu = 1;
         }
 #endif
@@ -4319,7 +4320,8 @@
 #endif
 #ifdef HAVE_NS
              /* certain system events are non-key events */
-             if (event->kind == NS_NONKEY_EVENT)
+             if (used_mouse_menu
+                  && event->kind == NS_NONKEY_EVENT)
                *used_mouse_menu = 1;
 #endif