diff options
| author | Adrian Robert <Adrian.B.Robert@gmail.com> | 2009-06-08 08:28:09 +0000 |
|---|---|---|
| committer | Adrian Robert <Adrian.B.Robert@gmail.com> | 2009-06-08 08:28:09 +0000 |
| commit | 5acf9d90c9780887ed0a816255bd3152c9b9b515 (patch) | |
| tree | e398f95c234754ae596356b435873b6f7511589f | |
| parent | 521e469fe3f5952320930b34152af766fc65037a (diff) | |
| download | emacs-5acf9d90c9780887ed0a816255bd3152c9b9b515.tar.gz | |
keyboard.c (kbd_buffer_get_event): Null-check used_mouse_menu.
| -rw-r--r-- | src/keyboard.c | 6 |
1 files 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 |