From c80c6166fbc20ffde6a2b407507226cac37cd9c4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Wed, 24 Nov 2010 15:52:14 +0100 Subject: [PATCH] nsterm.m (keyDown): Compare Left key masks exactly (Bug#7458). --- src/ChangeLog | 3 ++- src/nsterm.m | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 4fe2d8864ae..ba298d8aa48 100644 --- 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 diff --git a/src/nsterm.m b/src/nsterm.m index 04951bb5068..3adb67717d5 100644 --- 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)) -- 2.39.2