andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Adrian Robert 2009-09-18 23:54:04 +00:00
parent e2b6daf419
commit 0bae4e09ed
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/ChangeLog
View file

@ -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>

11
src/nsmenu.m
View file

@ -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];
}