diff options
| author | David Reitter | 2009-09-25 17:40:53 +0000 |
|---|---|---|
| committer | David Reitter | 2009-09-25 17:40:53 +0000 |
| commit | 4ff670a8b8c0c34e021106cd005a7815b4e98ce3 (patch) | |
| tree | f51cc86d4fb523ab1fed26a73aadd3029b77d9d7 /src/nsmenu.m | |
| parent | f146e75f8dbb7958ba897203c8d0f78525dacf71 (diff) | |
| download | emacs-4ff670a8b8c0c34e021106cd005a7815b4e98ce3.tar.gz emacs-4ff670a8b8c0c34e021106cd005a7815b4e98ce3.zip | |
nsmenu.m (EmacsMenu-clear): Recognize application menu
on Mac OS X 10.6+ (bug#4513).
Diffstat (limited to 'src/nsmenu.m')
| -rw-r--r-- | src/nsmenu.m | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nsmenu.m b/src/nsmenu.m index 79644d28a80..749a1d0fe76 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m | |||
| @@ -668,7 +668,7 @@ name_is_separator (name) | |||
| 668 | 668 | ||
| 669 | 669 | ||
| 670 | /* convenience */ | 670 | /* convenience */ |
| 671 | -(void) clear | 671 | -(void)clear |
| 672 | { | 672 | { |
| 673 | int n; | 673 | int n; |
| 674 | 674 | ||
| @@ -676,7 +676,9 @@ name_is_separator (name) | |||
| 676 | { | 676 | { |
| 677 | NSMenuItem *item = [self itemAtIndex: n]; | 677 | NSMenuItem *item = [self itemAtIndex: n]; |
| 678 | NSString *title = [item title]; | 678 | NSString *title = [item title]; |
| 679 | if (([title length] == 0 || [@"Apple" isEqualToString: title]) | 679 | if (([title length] == 0 /* OSX 10.5 */ |
| 680 | || [@"Emacs" isEqualToString: title] /* from 10.6 on */ | ||
| 681 | || [@"Apple" isEqualToString: title]) /* older */ | ||
| 680 | && ![item isSeparatorItem]) | 682 | && ![item isSeparatorItem]) |
| 681 | continue; | 683 | continue; |
| 682 | [self removeItemAtIndex: n]; | 684 | [self removeItemAtIndex: n]; |