# HG changeset patch
# User Adrian Robert <Adrian.B.Robert@gmail.com>
# Date 1244449689 0
# Node ID 2fe39f90ec759ced47bb91717ec9f9d435dc34ee
# Parent  f7892718d29758dd19021615edea4bbf06d89752
keyboard.c (kbd_buffer_get_event): Null-check used_mouse_menu.

diff -r f7892718d297 -r 2fe39f90ec75 src/keyboard.c
--- a/src/keyboard.c	Mon Jun 08 04:42:55 2009 +0000
+++ b/src/keyboard.c	Mon Jun 08 08:28:09 2009 +0000
@@ -4162,7 +4162,8 @@
           else
             obj = Fcons (intern ("ns-unput-working-text"), Qnil);
 	  kbd_fetch_ptr = event + 1;
-	  *used_mouse_menu = 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