# HG changeset patch
# User Steven Tamm <steventamm@mac.com>
# Date 1088490188 0
# Node ID fd126130c3cd851f4b7a34e28a0d39c008cb1c8f
# Parent  b04610e283ced94067329b67a905d7ae1beaa7b0
macterm.c (mac_get_emulated_btn)
(mac_event_to_emacs_modifiers): Fix emulated mouse button
support to correctly mask out modifiers.

diff -r b04610e283ce -r fd126130c3cd src/ChangeLog
--- a/src/ChangeLog	Tue Jun 29 02:37:52 2004 +0000
+++ b/src/ChangeLog	Tue Jun 29 06:23:08 2004 +0000
@@ -1,9 +1,15 @@
+2004-06-29  Steven Tamm  <steventamm@mac.com>
+
+	* macterm.c (mac_get_emulated_btn)
+	(mac_event_to_emacs_modifiers): Fix emulated mouse button
+	support to correctly mask out modifiers.
+
 2004-06-29  David Kastrup  <dak@gnu.org>
 
 	* search.c (Fset_match_data): Allow buffer before end of list
 	which can happen if set-match-data is using a pre-consed list.
 
-2004-06-28  Steven Tamm  <tamm@Steven-Tamms-Computer.local>
+2004-06-28  Steven Tamm  <steventamm@mac.com>
 
 	* macterm.c (XTread_socket): Correctly set the frame position
 	after the window is moved.
diff -r b04610e283ce -r fd126130c3cd src/macterm.c
--- 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);
 }