Commit 61c2b0b3 authored by Jan Djärv's avatar Jan Djärv
Browse files

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

is grabbed.

Fixes: debbugs:16565
parent 1dcb169c
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
......
......@@ -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. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment