# HG changeset patch
# User David Reitter <david.reitter@gmail.com>
# Date 1253900453 0
# Node ID f9c0c73cfc745de6cdc51ea8dd218dea511e4131
# Parent  8b6d9d4b0bf1b2609cec2e813f92c8225c92cc3a
nsmenu.m (EmacsMenu-clear): Recognize application menu
	on Mac OS X 10.6+ (bug#4513).

diff -r 8b6d9d4b0bf1 -r f9c0c73cfc74 src/ChangeLog
--- a/src/ChangeLog	Fri Sep 25 06:15:30 2009 +0000
+++ b/src/ChangeLog	Fri Sep 25 17:40:53 2009 +0000
@@ -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 -r 8b6d9d4b0bf1 -r f9c0c73cfc74 src/nsmenu.m
--- a/src/nsmenu.m	Fri Sep 25 06:15:30 2009 +0000
+++ b/src/nsmenu.m	Fri Sep 25 17:40:53 2009 +0000
@@ -668,7 +668,7 @@
 
 
 /* convenience */
--(void) clear
+-(void)clear
 {
   int n;
   
@@ -676,7 +676,9 @@
     {
       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];