Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
0bae4e09
Commit
0bae4e09
authored
Sep 18, 2009
by
Adrian Robert
Browse files
* nsmenu.m (EmacsMenu-parseKeyEquiv:): Parse key equivalent more carefully.
parent
e2b6daf4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
6 deletions
+12
-6
src/ChangeLog
src/ChangeLog
+6
-1
src/nsmenu.m
src/nsmenu.m
+6
-5
No files found.
src/ChangeLog
View file @
0bae4e09
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>
...
...
src/nsmenu.m
View file @
0bae4e09
...
...
@@ -610,11 +610,12 @@ -(NSString *)parseKeyEquiv: (char *)key
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
];
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment