nsmenu.m (EmacsMenu-clear): Recognize application menu

	on Mac OS X 10.6+ (bug#4513).

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  <david.reitter@gmail.com>
+
+        * nsmenu.m (EmacsMenu-clear): Recognize application menu
+        on Mac OS X 10.6+ (bug#4513).
+
 2009-09-24  Juanma Barranquero  <lekktu@gmail.com>
 
         * 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];