mac-emulate-three-button-mouse feature does not work correctly

[MURAMATSU Atsushi]

This bug report will be sent to the Free Software Foundation,
not to your local site managers!
Please write in English if possible, because the Emacs maintainers
usually do not have translators to read other languages for them.

Your bug report will be posted to the address@hidden mailing list.

Please describe exactly what actions triggered the bug
and the precise symptoms of the bug:

I use Carbon Emacs on MacOS 10.3.4. I wrote "(setq
mac-emulate-three-button-mouse t)" in ~/.emacs. Then I press
mouse-button with option-key or command-key, emacs cannot
recognize it as [mouse-2] or [mouse-3], mistakes as [M-mouse-2]
or [M-mouse-1].

I changed src/macterm.c like below patch, emacs works as that I hope.

In GNU Emacs 21.3.50.1 (powerpc-apple-darwin7.3.0)
 of 2004-06-02 on dhcp232.o.kuee.kyoto-u.ac.jp
configured using `configure '--with-carbon' '--without-x' 
'--enable-carbon-app=/Applications''

Important settings:
  value of $LC_ALL: nil
  value of $LC_COLLATE: C
  value of $LC_CTYPE: ja_JP.UTF-8
  value of $LC_MESSAGES: C
  value of $LC_MONETARY: C
  value of $LC_NUMERIC: C
  value of $LC_TIME: C
  value of $LANG: ja_JP.UTF-8
  locale-coding-system: utf-8
  default-enable-multibyte-characters: t

Index: src/macterm.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/macterm.c,v
retrieving revision 1.70
diff -c -r1.70 macterm.c
*** src/macterm.c       30 May 2004 00:18:41 -0000      1.70
--- src/macterm.c       4 Jun 2004 18:09:10 -0000
***************
*** 7018,7024 ****
    int result = 0;
    if (!NILP (Vmac_emulate_three_button_mouse)) {
      int cmdIs3 = !EQ (Vmac_emulate_three_button_mouse, Qreverse);
!     if (modifiers & controlKey)
        result = cmdIs3 ? 2 : 1;
      else if (modifiers & optionKey)
        result = cmdIs3 ? 1 : 2;
--- 7018,7024 ----
    int result = 0;
    if (!NILP (Vmac_emulate_three_button_mouse)) {
      int cmdIs3 = !EQ (Vmac_emulate_three_button_mouse, Qreverse);
!     if (modifiers & cmdKey)
        result = cmdIs3 ? 2 : 1;
      else if (modifiers & optionKey)
        result = cmdIs3 ? 1 : 2;
***************
*** 7038,7044 ****
    if (!NILP (Vmac_emulate_three_button_mouse) &&
        GetEventClass(eventRef) == kEventClassMouse)
      {
!       mods &= ~(optionKey & cmdKey);
      }
    return mac_to_emacs_modifiers (mods);
  }
--- 7038,7044 ----
    if (!NILP (Vmac_emulate_three_button_mouse) &&
        GetEventClass(eventRef) == kEventClassMouse)
      {
!       mods &= ~(optionKey | cmdKey);
      }
    return mac_to_emacs_modifiers (mods);
  }

-- 
amura / MURAMATSU Atsushi  <address@hidden>
## Informations of I and my works at "http://tt.sakura.ne.jp/~amura/";
                               With Amiga/*BSD/MacOS X/Psion's rules!