diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-10-12 11:02:47 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-10-12 11:02:47 -0700 |
| commit | 80b20192ee51bc7110eb519d0163f2ac4af590b7 (patch) | |
| tree | 732039301ec7c39eb0bdca635ec0e6bd917533fa | |
| parent | b73d3f58344e01f44d11f4305e19af0e29f97796 (diff) | |
| download | emacs-80b20192ee51bc7110eb519d0163f2ac4af590b7.tar.gz | |
* nsmenu.m (clear): Assume OS X 10.6 or later.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/nsmenu.m | 4 |
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 @@ +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]; |