From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 12 Oct 2014 18:02:47 +0000 (-0700)
Subject: * nsmenu.m (clear): Assume OS X 10.6 or later.
X-Git-Tag: emacs-25.0.90~2635^2~679^2~73
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=80b20192ee51bc7110eb519d0163f2ac4af590b7;p=emacs.git

* nsmenu.m (clear): Assume OS X 10.6 or later.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 966363d7134..46f50364890 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* nsmenu.m (clear): Assume OS X 10.6 or later.
+
 2014-10-12  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* unexmacosx.c: Remove include ppc/reloc.h.
diff --git a/src/nsmenu.m b/src/nsmenu.m
index 3d444dea61d..a90cb970874 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -693,9 +693,7 @@ x_activate_menubar (struct frame *f)
     {
       NSMenuItem *item = [self itemAtIndex: n];
       NSString *title = [item title];
-      if (([title length] == 0  /* OSX 10.5 */
-	   || [ns_app_name isEqualToString: title]  /* from 10.6 on */
-	   || [@"Apple" isEqualToString: title]) /* older */
+      if ([ns_app_name isEqualToString: title]
           && ![item isSeparatorItem])
         continue;
       [self removeItemAtIndex: n];