From 0bae4e09edd730765af582e5c414a83fdc454869 Mon Sep 17 00:00:00 2001 From: Adrian Robert Date: Fri, 18 Sep 2009 23:54:04 +0000 Subject: [PATCH] * nsmenu.m (EmacsMenu-parseKeyEquiv:): Parse key equivalent more carefully. --- src/ChangeLog | 7 ++++++- src/nsmenu.m | 11 ++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index b44073fda69..566707d3a40 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2009-09-18 Rob Christie (tiny change) + + * nsmenu.m (EmacsMenu-parseKeyEquiv:): Parse key equivalent more + carefully. (Bug #4339) + 2009-09-18 Chong Yidong * 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 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]; } -- 2.39.5