Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-57

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 324-352)

   - Merge from gnus--rel--5.10
   - Update from CVS
   - etc/emacs-buffer.gdb: Remove RCS keywords

 * gnus--rel--5.10  (patch 70-79)

   - Update from CVS
   - Merge from emacs--cvs-trunk--0

1 files changed, 4 insertions, 0 deletions

diff --git a/src/xmenu.c b/src/xmenu.c
index 9103d32e1c9..826c9330c46 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1235,6 +1235,10 @@ popup_get_selection (initial_event, dpyinfo, id, do_timers)
       if (event.type == ButtonRelease
           && dpyinfo->display == event.xbutton.display)
         {
+          /* If the click is not on the menu, deactivate the menu.  */
+          if (x_any_window_to_frame (dpyinfo, event.xexpose.window))
+            popup_activated_flag = 0;
+            
           dpyinfo->grabbed &= ~(1 << event.xbutton.button);
 #ifdef USE_MOTIF /* Pretending that the event came from a
                     Btn1Down seems the only way to convince Motif to