From 5acf9d90c9780887ed0a816255bd3152c9b9b515 Mon Sep 17 00:00:00 2001 From: Adrian Robert <Adrian.B.Robert@gmail.com> Date: Mon, 8 Jun 2009 08:28:09 +0000 Subject: [PATCH] keyboard.c (kbd_buffer_get_event): Null-check used_mouse_menu. --- src/keyboard.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/keyboard.c b/src/keyboard.c index c47bf86fe2b..8ed335a12bb 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -4162,7 +4162,8 @@ 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; + if (used_mouse_menu) + *used_mouse_menu = 1; } #endif @@ -4319,7 +4320,8 @@ kbd_buffer_get_event (kbp, used_mouse_menu, end_time) #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 -- 2.39.5