procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* nsfns.m (handlePanelKeys): Don't process Command+Function keys.

Browse source 
Let the super performKeyEquivalent deal with them.

Fixes: debbugs:14747
This commit is contained in:
Jan Djärv 2013-06-30 18:38:26 +02:00
parent 1d71c1d9de
commit 9d3f2fc286
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2013-06-30 Jan Djärv <jan.h.d@swipnet.se>
* nsfns.m (handlePanelKeys): Don't process Command+Function keys.
Let the super performKeyEquivalent deal with them (Bug#14747).
2013-06-30 Paul Eggert <eggert@cs.ucla.edu>
* widget.c (resize_cb): Remove unused local.

10
src/nsfns.m
View file

@ -2705,8 +2705,14 @@ DY added (default is -10).
case NSPageUpFunctionKey:
case NSPageDownFunctionKey:
case NSEndFunctionKey:
[panel sendEvent: theEvent];
ret = YES;
/* Don't send command modified keys, as those are handled in the
performKeyEquivalent method of the super class.
*/
if (! ([theEvent modifierFlags] & NSCommandKeyMask))
{
[panel sendEvent: theEvent];
ret = YES;
}
break;
/* As we don't have the standard key commands for
copy/paste/cut/select-all in our edit menu, we must handle