1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-03 12:31:32 -08:00

nsmenu.m (EmacsMenu-clear): Recognize application menu

on Mac OS X 10.6+ (bug#4513).
This commit is contained in:
David Reitter 2009-09-25 17:40:53 +00:00
parent f146e75f8d
commit 4ff670a8b8
2 changed files with 9 additions and 2 deletions

View file

@ -1,3 +1,8 @@
2009-09-25 David Reitter <david.reitter@gmail.com>
* nsmenu.m (EmacsMenu-clear): Recognize application menu
on Mac OS X 10.6+ (bug#4513).
2009-09-24 Juanma Barranquero <lekktu@gmail.com>
* frame.c (xrdb_get_resource): Return nil for empty string resources;

View file

@ -668,7 +668,7 @@ name_is_separator (name)
/* convenience */
-(void) clear
-(void)clear
{
int n;
@ -676,7 +676,9 @@ name_is_separator (name)
{
NSMenuItem *item = [self itemAtIndex: n];
NSString *title = [item title];
if (([title length] == 0 || [@"Apple" isEqualToString: title])
if (([title length] == 0 /* OSX 10.5 */
|| [@"Emacs" isEqualToString: title] /* from 10.6 on */
|| [@"Apple" isEqualToString: title]) /* older */
&& ![item isSeparatorItem])
continue;
[self removeItemAtIndex: n];