[Emacs-diffs] trunk r113237: * nsfns.m (handlePanelKeys): Don't process Command+Function keys.

[Jan D.]

------------------------------------------------------------
revno: 113237
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14747
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2013-06-30 18:38:26 +0200
message:
  * nsfns.m (handlePanelKeys): Don't process Command+Function keys.
  Let the super performKeyEquivalent deal with them.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsfns.m                    nsfns.m-20091113204419-o5vbwnq5f7feedwu-8741

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-06-30 16:14:22 +0000
+++ b/src/ChangeLog     2013-06-30 16:38:26 +0000
@@ -1,3 +1,8 @@
+2013-06-30  Jan Djärv  <address@hidden>
+
+       * nsfns.m (handlePanelKeys): Don't process Command+Function keys.
+       Let the super performKeyEquivalent deal with them (Bug#14747).
+
 2013-06-30  Paul Eggert  <address@hidden>
 
        * widget.c (resize_cb): Remove unused local.

=== modified file 'src/nsfns.m'
--- a/src/nsfns.m       2013-06-02 19:14:25 +0000
+++ b/src/nsfns.m       2013-06-30 16:38:26 +0000
@@ -2705,8 +2705,14 @@
         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