diff options
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/nsfns.m | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3aaa7b778e..9dc1b989e3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2013-06-30 Jan Djärv <[email protected]> + + * nsfns.m (handlePanelKeys): Don't process Command+Function keys. + Let the super performKeyEquivalent deal with them (Bug#14747). + 2013-06-30 Paul Eggert <[email protected]> * widget.c (resize_cb): Remove unused local. diff --git a/src/nsfns.m b/src/nsfns.m index 9433918315..1e075995c1 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -2705,8 +2705,14 @@ handlePanelKeys (NSSavePanel *panel, NSEvent *theEvent) 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 |