* xmenu.c (create_and_show_popup_menu): Handle case when no key

is grabbed.

Fixes: debbugs:16565

2 files changed, 7 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5fc29d30d4c..3634c088f7e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-29  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xmenu.c (create_and_show_popup_menu): Handle case when no key
+        is grabbed (Bug#16565).
+
 2014-01-28  Martin Rudalics  <rudalics@gmx.at>
 
         * xdisp.c (last_max_ascent): Re-remove after erroneously
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.  */