Mercurial > emacs

diff src/macterm.c @ 56277:fd126130c3cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
macterm.c (mac_get_emulated_btn) (mac_event_to_emacs_modifiers): Fix emulated mouse button support to correctly mask out modifiers.
author Steven Tamm <steventamm@mac.com>
date Tue, 29 Jun 2004 06:23:08 +0000
parents 98f2b9da67f0
children 3d525d0266de
line wrap: on
line diff
--- a/src/macterm.c	Tue Jun 29 02:37:52 2004 +0000
+++ b/src/macterm.c	Tue Jun 29 06:23:08 2004 +0000
@@ -7018,7 +7018,7 @@
   int result = 0;
   if (!NILP (Vmac_emulate_three_button_mouse)) {
     int cmdIs3 = !EQ (Vmac_emulate_three_button_mouse, Qreverse);
-    if (modifiers & controlKey)
+    if (modifiers & cmdKey)
       result = cmdIs3 ? 2 : 1;
     else if (modifiers & optionKey)
       result = cmdIs3 ? 1 : 2;
@@ -7038,7 +7038,7 @@
   if (!NILP (Vmac_emulate_three_button_mouse) &&
       GetEventClass(eventRef) == kEventClassMouse)
     {
-      mods &= ~(optionKey & cmdKey);
+      mods &= ~(optionKey | cmdKey);
     }
   return mac_to_emacs_modifiers (mods);
 }