summaryrefslogtreecommitdiff
path: root/src/nsmenu.m
diff options
context:
space:
mode:
authorDavid Reitter <david.reitter@gmail.com>2009-09-25 17:40:53 +0000
committerDavid Reitter <david.reitter@gmail.com>2009-09-25 17:40:53 +0000
commit4ff670a8b8c0c34e021106cd005a7815b4e98ce3 (patch)
treef51cc86d4fb523ab1fed26a73aadd3029b77d9d7 /src/nsmenu.m
parentf146e75f8dbb7958ba897203c8d0f78525dacf71 (diff)
downloademacs-4ff670a8b8c0c34e021106cd005a7815b4e98ce3.tar.gz
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.m6
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)
/* convenience */
--(void) clear
+-(void)clear
{
int n;
@@ -676,7 +676,9 @@ name_is_separator (name)
{
NSMenuItem *item = [self itemAtIndex: n];
NSString *title = [item title];
- if (([title length] == 0 || [@"Apple" isEqualToString: title])
+ if (([title length] == 0 /* OSX 10.5 */
+ || [@"Emacs" isEqualToString: title] /* from 10.6 on */
+ || [@"Apple" isEqualToString: title]) /* older */
&& ![item isSeparatorItem])
continue;
[self removeItemAtIndex: n];