[Emacs-diffs] Changes to emacs/src/macterm.c

[Steven Tamm]

Index: emacs/src/macterm.c
diff -c emacs/src/macterm.c:1.72 emacs/src/macterm.c:1.73
*** emacs/src/macterm.c:1.72    Mon Jun 28 16:20:38 2004
--- emacs/src/macterm.c Tue Jun 29 06:23:08 2004
***************
*** 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);
  }