[Emacs-diffs] emacs/src nsmenu.m ChangeLog

[David Reitter]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     David Reitter <davidswelt>      09/09/25 17:40:55

Modified files:
        src            : nsmenu.m ChangeLog 

Log message:
        nsmenu.m (EmacsMenu-clear): Recognize application menu
                on Mac OS X 10.6+ (bug#4513).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsmenu.m?cvsroot=emacs&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7768&r2=1.7769

Patches:
Index: nsmenu.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsmenu.m,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- nsmenu.m    22 Sep 2009 19:49:50 -0000      1.26
+++ nsmenu.m    25 Sep 2009 17:40:53 -0000      1.27
@@ -668,7 +668,7 @@
 
 
 /* convenience */
--(void) clear
+-(void)clear
 {
   int n;
   
@@ -676,7 +676,9 @@
     {
       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];

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7768
retrieving revision 1.7769
diff -u -b -r1.7768 -r1.7769
--- ChangeLog   24 Sep 2009 16:59:14 -0000      1.7768
+++ ChangeLog   25 Sep 2009 17:40:53 -0000      1.7769
@@ -1,3 +1,8 @@
+2009-09-25  David Reitter  <address@hidden>
+
+       * nsmenu.m (EmacsMenu-clear): Recognize application menu
+       on Mac OS X 10.6+ (bug#4513).
+
 2009-09-24  Juanma Barranquero  <address@hidden>
 
        * frame.c (xrdb_get_resource): Return nil for empty string resources;