[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/w32menu.c,v [EMACS_22_BASE]
From: |
Jason Rumney |
Subject: |
[Emacs-diffs] Changes to emacs/src/w32menu.c,v [EMACS_22_BASE] |
Date: |
Tue, 26 Aug 2008 14:23:30 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Branch: EMACS_22_BASE
Changes by: Jason Rumney <jasonr> 08/08/26 14:23:29
Index: w32menu.c
===================================================================
RCS file: /sources/emacs/emacs/src/w32menu.c,v
retrieving revision 1.88.2.4
retrieving revision 1.88.2.5
diff -u -b -r1.88.2.4 -r1.88.2.5
--- w32menu.c 8 Jan 2008 04:29:45 -0000 1.88.2.4
+++ w32menu.c 26 Aug 2008 14:23:28 -0000 1.88.2.5
@@ -812,6 +812,7 @@
if (NILP (position))
{
discard_menu_items ();
+ FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
UNGCPRO;
return Qnil;
}
@@ -825,6 +826,7 @@
if (current_popup_menu)
{
discard_menu_items ();
+ FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
UNGCPRO;
return Qnil;
}
@@ -837,6 +839,7 @@
UNBLOCK_INPUT;
discard_menu_items ();
+ FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
#endif /* HAVE_MENUS */
@@ -959,6 +962,7 @@
UNBLOCK_INPUT;
discard_menu_items ();
+ FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
if (error_name) error (error_name);
return selection;
@@ -1931,6 +1935,7 @@
/* 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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/src/w32menu.c,v [EMACS_22_BASE],
Jason Rumney <=