[Emacs-diffs] trunk r116190: * xmenu.c (create_and_show_popup_menu): Handle case when no key

[Jan D.]

------------------------------------------------------------
revno: 116190
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16565
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Wed 2014-01-29 09:23:59 +0100
message:
  * xmenu.c (create_and_show_popup_menu): Handle case when no key
  is grabbed.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xmenu.c                    xmenu.c-20091113204419-o5vbwnq5f7feedwu-161

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-01-28 09:45:37 +0000
+++ b/src/ChangeLog     2014-01-29 08:23:59 +0000
@@ -1,3 +1,8 @@
+2014-01-29  Jan Djärv  <address@hidden>
+
+       * xmenu.c (create_and_show_popup_menu): Handle case when no key
+       is grabbed (Bug#16565).
+
 2014-01-28  Martin Rudalics  <address@hidden>
 
        * xdisp.c (last_max_ascent): Re-remove after erroneously

=== modified file 'src/xmenu.c'
--- a/src/xmenu.c       2014-01-13 01:40:35 +0000
+++ b/src/xmenu.c       2014-01-29 08:23:59 +0000
@@ -1306,6 +1306,8 @@
       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.  */