diff options
| author | Miles Bader <miles@gnu.org> | 2008-09-02 05:35:54 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2008-09-02 05:35:54 +0000 |
| commit | 9850eff524bd0747a9561f3b4c90dfc3749f4ecb (patch) | |
| tree | c05e918b9763310aea577eefc476aaccf20eb86a /src/w32menu.c | |
| parent | 9a73a6c9dbd5a98e8e27cccbf1361f89070b94e7 (diff) | |
| parent | 7f02dd2cf6cb7395cb06104fd052f08cc91e9e10 (diff) | |
| download | emacs-9850eff524bd0747a9561f3b4c90dfc3749f4ecb.tar.gz | |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1398
Diffstat (limited to 'src/w32menu.c')
| -rw-r--r-- | src/w32menu.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/w32menu.c b/src/w32menu.c index fb54caf8806..067049808ad 100644 --- a/src/w32menu.c +++ b/src/w32menu.c @@ -342,6 +342,7 @@ cached information about equivalent key sequences. */) if (NILP (position)) { discard_menu_items (); + FRAME_X_DISPLAY_INFO (f)->grabbed = 0; UNGCPRO; return Qnil; } @@ -355,6 +356,7 @@ cached information about equivalent key sequences. */) if (current_popup_menu) { discard_menu_items (); + FRAME_X_DISPLAY_INFO (f)->grabbed = 0; UNGCPRO; return Qnil; } @@ -367,6 +369,7 @@ cached information about equivalent key sequences. */) UNBLOCK_INPUT; discard_menu_items (); + FRAME_X_DISPLAY_INFO (f)->grabbed = 0; #endif /* HAVE_MENUS */ @@ -495,6 +498,7 @@ otherwise it is "Question". */) UNBLOCK_INPUT; discard_menu_items (); + FRAME_X_DISPLAY_INFO (f)->grabbed = 0; if (error_name) error (error_name); return selection; @@ -1165,6 +1169,7 @@ w32_menu_show (f, x, y, for_click, keymaps, title, error) /* Clean up extraneous mouse events which might have been generated during the call. */ discard_mouse_events (); + FRAME_X_DISPLAY_INFO (f)->grabbed = 0; /* Free the widget_value objects we used to specify the contents. */ free_menubar_widget_value_tree (first_wv); |