summaryrefslogtreecommitdiff
path: root/src/xmenu.c
diff options
context:
space:
mode:
authorJan Djärv <jan.h.d@swipnet.se>2014-01-29 09:23:59 +0100
committerJan Djärv <jan.h.d@swipnet.se>2014-01-29 09:23:59 +0100
commit61c2b0b3268dd5deb8958185fecdc5c947bfe485 (patch)
tree0bb3cf78c7e4103da4a452632bdcb5a44cbe8fd0 /src/xmenu.c
parent1dcb169c8116b08391751ff506a755be87d42133 (diff)
downloademacs-61c2b0b3268dd5deb8958185fecdc5c947bfe485.tar.gz
emacs-61c2b0b3268dd5deb8958185fecdc5c947bfe485.tar.bz2
emacs-61c2b0b3268dd5deb8958185fecdc5c947bfe485.zip
* xmenu.c (create_and_show_popup_menu): Handle case when no key
is grabbed. Fixes: debbugs:16565
Diffstat (limited to 'src/xmenu.c')
-rw-r--r--src/xmenu.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/xmenu.c b/src/xmenu.c
index 6f628527a6d..c101d9f5975 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1306,6 +1306,8 @@ create_and_show_popup_menu (struct frame *f, widget_value *first_wv,
for (i = 0; i < 5; i++)
if (FRAME_DISPLAY_INFO (f)->grabbed & (1 << i))
break;
+ // If keys aren't grabbed (i.e. a mouse up event), use 0.
+ if (i == 5) i = 0;
}
/* Display the menu. */