Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 793-802)

   - Update from CVS
   - Remove RCS keywords
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 42-50)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Gnus ChangeLog tweaks

 * gnus--rel--5.10  (patch 229-232)

   - Merge from emacs--devo--0, emacs--rel--22
   - ChangeLog tweak
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-23

1 files changed, 4 insertions, 0 deletions

diff --git a/src/macmenu.c b/src/macmenu.c
index 1eb0b16cd95..c10a76f8a5d 100644
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -1602,6 +1602,10 @@ menu_target_item_handler (next_handler, event, data)
   GrafPtr port;
   int specpdl_count = SPECPDL_INDEX ();
 
+  /* Don't be bothered with the overflowed toolbar items menu.  */
+  if (!popup_activated ())
+    return eventNotHandledErr;
+
   err = GetEventParameter (event, kEventParamDirectObject, typeMenuRef,
                            NULL, sizeof (MenuRef), NULL, &menu);
   if (err == noErr)