aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2014-10-12 11:02:47 -0700
committerPaul Eggert2014-10-12 11:02:47 -0700
commit80b20192ee51bc7110eb519d0163f2ac4af590b7 (patch)
tree732039301ec7c39eb0bdca635ec0e6bd917533fa /src
parentb73d3f58344e01f44d11f4305e19af0e29f97796 (diff)
downloademacs-80b20192ee51bc7110eb519d0163f2ac4af590b7.tar.gz
emacs-80b20192ee51bc7110eb519d0163f2ac4af590b7.zip
* nsmenu.m (clear): Assume OS X 10.6 or later.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/nsmenu.m4
2 files changed, 5 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 966363d7134..46f50364890 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12014-10-12 Paul Eggert <eggert@cs.ucla.edu>
2
3 * nsmenu.m (clear): Assume OS X 10.6 or later.
4
12014-10-12 Jan Djärv <jan.h.d@swipnet.se> 52014-10-12 Jan Djärv <jan.h.d@swipnet.se>
2 6
3 * unexmacosx.c: Remove include ppc/reloc.h. 7 * 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)
693 { 693 {
694 NSMenuItem *item = [self itemAtIndex: n]; 694 NSMenuItem *item = [self itemAtIndex: n];
695 NSString *title = [item title]; 695 NSString *title = [item title];
696 if (([title length] == 0 /* OSX 10.5 */ 696 if ([ns_app_name isEqualToString: title]
697 || [ns_app_name isEqualToString: title] /* from 10.6 on */
698 || [@"Apple" isEqualToString: title]) /* older */
699 && ![item isSeparatorItem]) 697 && ![item isSeparatorItem])
700 continue; 698 continue;
701 [self removeItemAtIndex: n]; 699 [self removeItemAtIndex: n];