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

diff --git a/src/ChangeLog b/src/ChangeLog
index b44073fda690a5c4f363a25a1172a973ccd9623d..566707d3a407d8d5f6b2fb84dabf8f20c036861d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-18  Rob Christie  <robchristie@gmail.com> (tiny change)
+
+       * nsmenu.m (EmacsMenu-parseKeyEquiv:): Parse key equivalent more
+       carefully. (Bug #4339)
+
 2009-09-18  Chong Yidong  <cyd@stupidchicken.com>
 
        * 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  <lekktu@gmail.com>
 

diff --git a/src/nsmenu.m b/src/nsmenu.m
index 05184660bac50d5b09c28ac057bd5b226829e551..335e4c0e640b7a8ea3424710b3fbdb9fb8ff9b1a 100644 (file)
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -610,11 +610,12 @@ name_is_separator (name)
   
   while (*tpos == ' ' || *tpos == '(')
     tpos++;
-  if (*tpos != 's') {
-    keyEquivModMask = 0; /* signal */
-    return [NSString stringWithUTF8String: tpos];
-  }
-  return [NSString stringWithFormat: @"%c", tpos[2]];
+  if ((*tpos == 's') && (*(tpos+1) == '-'))
+    {
+      return [NSString stringWithFormat: @"%c", tpos[2]];
+    }
+  keyEquivModMask = 0; /* signal */
+  return [NSString stringWithUTF8String: tpos];
 }