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

diff --git a/src/ChangeLog b/src/ChangeLog
index 966363d713436921bec72414b44687328a533299..46f5036489044f09d463da09233dc046443f0d85 100644 (file)
--- 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 3d444dea61d3df94f6930626ad0bebb88099315d..a90cb9708748213fa623d37a3ff9721878459edf 100644 (file)
--- 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];