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

1 files changed, 6 insertions, 5 deletions

diff --git a/src/nsmenu.m b/src/nsmenu.m
index 05184660bac..335e4c0e640 100644
--- 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];
 }