[Emacs-diffs] /srv/bzr/emacs/trunk r102503: nsterm.m (keyDown): Compare Left key masks exactly (Bug#7458).

[Jan D.]

------------------------------------------------------------
revno: 102503
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Wed 2010-11-24 15:52:14 +0100
message:
  nsterm.m (keyDown): Compare Left key masks exactly (Bug#7458).
modified:
  src/ChangeLog
  src/nsterm.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-11-24 07:50:08 +0000
+++ b/src/ChangeLog     2010-11-24 14:52:14 +0000
@@ -2,7 +2,8 @@
 
        * nsterm.m (NSLeftControlKeyMask, NSLeftCommandKeyMask)
        (NSLeftAlternateKeyMask): New defines.
-       (keyDown): Parse left and right keys separatly (Bug#7458).
+       (keyDown): Parse left and right keys separately (Bug#7458).
+       Compare Left key masks exactly (Bug#7458).
 
 2010-11-23  Eli Zaretskii  <address@hidden>
 

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2010-11-24 07:50:08 +0000
+++ b/src/nsterm.m      2010-11-24 14:52:14 +0000
@@ -4451,7 +4451,7 @@
            ? ns_command_modifier
            : ns_right_command_modifier);
 
-      if (flags & NSLeftCommandKeyMask)
+      if ((flags & NSLeftCommandKeyMask) == NSLeftCommandKeyMask)
         {
           emacs_event->modifiers |= parse_solitary_modifier
             (ns_command_modifier);
@@ -4494,7 +4494,7 @@
                ? ns_control_modifier
                : ns_right_control_modifier);
 
-      if (flags & NSLeftControlKeyMask)
+      if ((flags & NSLeftControlKeyMask) == NSLeftControlKeyMask)
         emacs_event->modifiers |= parse_solitary_modifier
           (ns_control_modifier);
 
@@ -4521,7 +4521,7 @@
                : ns_right_alternate_modifier);
         }
 
-      if (flags & NSLeftAlternateKeyMask) /* default = meta */
+      if ((flags & NSLeftAlternateKeyMask) == NSLeftAlternateKeyMask) /* 
default = meta */
         {
           if ((NILP (ns_alternate_modifier)
                || EQ (ns_alternate_modifier, Qnone))