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

[Adrian Robert]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Adrian Robert <arobert> 09/09/18 23:54:06

Modified files:
        src            : ChangeLog nsmenu.m 

Log message:
        * nsmenu.m (EmacsMenu-parseKeyEquiv:): Parse key equivalent more 
carefully.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7759&r2=1.7760
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsmenu.m?cvsroot=emacs&r1=1.24&r2=1.25

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7759
retrieving revision 1.7760
diff -u -b -r1.7759 -r1.7760
--- ChangeLog   18 Sep 2009 23:39:44 -0000      1.7759
+++ ChangeLog   18 Sep 2009 23:54:04 -0000      1.7760
@@ -1,3 +1,8 @@
+2009-09-18  Rob Christie  <address@hidden> (tiny change)
+
+       * nsmenu.m (EmacsMenu-parseKeyEquiv:): Parse key equivalent more
+       carefully. (Bug #4339)
+
 2009-09-18  Chong Yidong  <address@hidden>
 
        * syntax.c (Fchar_syntax): Minor doc fix (Bug#4400).
@@ -24,7 +29,7 @@
        * nsfns.m (x_get_string_resource): Ape just-previous changes to other
        platform versions.  Drop support for emacs-20-style face specs.
        (x-close-connection): Drop PSFlush() under OS X.
-       (x-focus-frame): Activate the app first.
+       (x-focus-frame): Activate the app first. (Bug #4180)
 
 2009-09-17  Juanma Barranquero  <address@hidden>
 

Index: nsmenu.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsmenu.m,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- nsmenu.m    21 Aug 2009 19:29:31 -0000      1.24
+++ nsmenu.m    18 Sep 2009 23:54:06 -0000      1.25
@@ -610,11 +610,12 @@
   
   while (*tpos == ' ' || *tpos == '(')
     tpos++;
-  if (*tpos != 's') {
+  if ((*tpos == 's') && (*(tpos+1) == '-'))
+    {
+      return [NSString stringWithFormat: @"%c", tpos[2]];
+    }
     keyEquivModMask = 0; /* signal */
     return [NSString stringWithUTF8String: tpos];
-  }
-  return [NSString stringWithFormat: @"%c", tpos[2]];
 }