Commit 9f9e1ff8 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(xmenu_show): Unconditionally update x_mouse_grabbed and Vmouse_depressed.

parent 6674f749
......@@ -1655,16 +1655,18 @@ xmenu_show (f, x, y, menubarp, keymaps, title, error)
if (event.type == ButtonRelease)
{
XtDispatchEvent (&event);
if (! menubarp)
{
/* Do the work of construct_mouse_click since it can't
be called. Initially, the popup menu has been called
from a ButtonPress in the edit_widget. Then the mouse
has been set to grabbed. Reset it now. */
x_mouse_grabbed &= ~(1 << event.xbutton.button);
if (!x_mouse_grabbed)
Vmouse_depressed = Qnil;
}
/* Do the work of construct_mouse_click since it can't
be called. Initially, the popup menu has been called
from a ButtonPress in the edit_widget. Then the mouse
has been set to grabbed. Reset it now. */
x_mouse_grabbed &= ~(1 << event.xbutton.button);
if (!x_mouse_grabbed)
Vmouse_depressed = Qnil;
/* If we release the button soon without selecting anything,
stay in the loop--that is, leave the menu posted.
Otherwise, exit this loop and thus pop down the menu. */
if (! (menu_item_selection == 0
&& !next_release_must_exit
&& (((XButtonEvent *) (&event))->time - last_event_timestamp
......
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