From 4ff670a8b8c0c34e021106cd005a7815b4e98ce3 Mon Sep 17 00:00:00 2001 From: David Reitter Date: Fri, 25 Sep 2009 17:40:53 +0000 Subject: [PATCH] nsmenu.m (EmacsMenu-clear): Recognize application menu on Mac OS X 10.6+ (bug#4513). --- src/ChangeLog | 5 +++++ src/nsmenu.m | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 66e0e7e034d..6a75d540986 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2009-09-25 David Reitter + + * nsmenu.m (EmacsMenu-clear): Recognize application menu + on Mac OS X 10.6+ (bug#4513). + 2009-09-24 Juanma Barranquero * frame.c (xrdb_get_resource): Return nil for empty string resources; 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]; -- 2.39.2