diff options
| author | Miles Bader | 2007-06-16 22:32:13 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-06-16 22:32:13 +0000 |
| commit | b36153926049c95ef192786f4ef6151dc6506de4 (patch) | |
| tree | 51890fa5961aa1dc989178cbbfabb03d2e443687 /src/macmenu.c | |
| parent | 650e2d284dcf9786a78abc3fef12599cf60d95da (diff) | |
| parent | 1562d1e9a73e608dbfe76bbedbeb2350d39e224f (diff) | |
| download | emacs-b36153926049c95ef192786f4ef6151dc6506de4.tar.gz emacs-b36153926049c95ef192786f4ef6151dc6506de4.zip | |
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--unicode--0--patch-223
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 5e6ad6f7d10..932af50bbd8 100644 --- a/src/macmenu.c +++ b/src/macmenu.c | |||
| @@ -1602,6 +1602,10 @@ menu_target_item_handler (next_handler, event, data) | |||
| 1602 | GrafPtr port; | 1602 | GrafPtr port; |
| 1603 | int specpdl_count = SPECPDL_INDEX (); | 1603 | int specpdl_count = SPECPDL_INDEX (); |
| 1604 | 1604 | ||
| 1605 | /* Don't be bothered with the overflowed toolbar items menu. */ | ||
| 1606 | if (!popup_activated ()) | ||
| 1607 | return eventNotHandledErr; | ||
| 1608 | |||
| 1605 | err = GetEventParameter (event, kEventParamDirectObject, typeMenuRef, | 1609 | err = GetEventParameter (event, kEventParamDirectObject, typeMenuRef, |
| 1606 | NULL, sizeof (MenuRef), NULL, &menu); | 1610 | NULL, sizeof (MenuRef), NULL, &menu); |
| 1607 | if (err == noErr) | 1611 | if (err == noErr) |