diff options
| author | Miles Bader <[email protected]> | 2007-06-16 22:33:42 +0000 |
|---|---|---|
| committer | Miles Bader <[email protected]> | 2007-06-16 22:33:42 +0000 |
| commit | 262d5ce7c21d6c1136fd2b8df67736e41e8e8953 (patch) | |
| tree | 853a5d30babd0abd585ccbe7f4e228bf43a42d5c /src/macmenu.c | |
| parent | 5534694247d2b5259325ff43af0624aa2f8abb3e (diff) | |
| parent | af41f8a8d6660ad1fefad5bda69d1acb8e40b4d1 (diff) | |
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: [email protected]/emacs--multi-tty--0--patch-23
Diffstat (limited to 'src/macmenu.c')
| -rw-r--r-- | src/macmenu.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/macmenu.c b/src/macmenu.c index 1eb0b16cd9..c10a76f8a5 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) |