nsterm.m (keyDown): Compare Left key masks exactly (Bug#7458).

diff --git a/src/ChangeLog b/src/ChangeLog
index 4fe2d8864aeee46671439f1020482d87f610fe64..ba298d8aa48ede6bff759440ad5050e56c35c963 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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  <eliz@gnu.org>
 

diff --git a/src/nsterm.m b/src/nsterm.m
index 04951bb50685d178fe73648d9e157c8a255d3c63..3adb67717d52d8e131f8a689834dfdd450ab982a 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -4451,7 +4451,7 @@ ns_term_shutdown (int sig)
            ? 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_term_shutdown (int sig)
                ? 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_term_shutdown (int sig)
                : 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))