# HG changeset patch
# User Adrian Robert <Adrian.B.Robert@gmail.com>
# Date 1253318044 0
# Node ID 02f10c9339ebd8e6cfb45ac4c2ca0b7c81176578
# Parent  7a2f279a2c8da1416699e322ce7112295216dbd1
* nsmenu.m (EmacsMenu-parseKeyEquiv:): Parse key equivalent more carefully.

diff -r 7a2f279a2c8d -r 02f10c9339eb src/ChangeLog
--- a/src/ChangeLog	Fri Sep 18 23:40:00 2009 +0000
+++ b/src/ChangeLog	Fri Sep 18 23:54:04 2009 +0000
@@ -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 -r 7a2f279a2c8d -r 02f10c9339eb src/nsmenu.m
--- a/src/nsmenu.m	Fri Sep 18 23:40:00 2009 +0000
+++ b/src/nsmenu.m	Fri Sep 18 23:54:04 2009 +0000
@@ -610,11 +610,12 @@
   
   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];
 }