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

80b20192 · Paul Eggert · b73d3f58 · 80b20192 · 80b20192
Commit 80b20192 authored Oct 12, 2014 by Paul Eggert
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

src/ChangeLog src/ChangeLog +4 -0

src/nsmenu.m src/nsmenu.m +1 -3

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+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.

--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -693,9 +693,7 @@ -(void)clear
    {
      NSMenuItem *item = [self itemAtIndex: n];
      NSString *title = [item title];
-      if (([title length] == 0  /* OSX 10.5 */
+      if ([ns_app_name isEqualToString: title]
-	   || [ns_app_name isEqualToString: title]  /* from 10.6 on */
-	   || [@"Apple" isEqualToString: title]) /* older */
          && ![item isSeparatorItem])
        continue;
      [self removeItemAtIndex: n];