In src:

2002-08-03  Andrew Choi  <akochoi@shaw.ca>

        * macterm.c (USE_CARBON_EVENTS): New macro.
        (macCtrlKey, macShiftKey, macMetaKey, macAltKey): New macros.
        (x_iconify_frame): Call CollapseWindow.
        (Vmac_reverse_ctrl_meta): New variable.
        (Vmac_wheel_button_is_mouse_2): New variable.
        (init_mac_drag_n_drop): New function.
        (mac_do_receive_drag): New function.
        (mac_handle_service_event): New function.
        (init_service_handler): New function.
        (mac_to_emacs_modifiers): New function.
        (mac_event_to_emacs_modifiers): New function.
        (mac_get_mouse_btn): New function.
        (mac_convert_event_ref): New function.
        (XTread_socket) [USE_CARBON_EVENTS]: Call ReceiveNextEvent,
        SendEventToEventTarget, mac_event_to_emacs_modifiers, and
        mac_get_mouse_btn.
        (mac_initialize): Call init_mac_drag_n_drop and
        init_service_handler.

        * keyboard.c: Define Qmouse_wheel, mouse_wheel_syms, and
        lispy_mouse_wheel_names for MAC_OSX as well as for WINDOWS_NT.
        (kbd_buffer_get_event): Set used_mouse_menu for MENU_BAR_EVENT and
        TOOL_BAR_EVENT for MAC_OS as well.
        (make_lispy_event): Handle MOUSE_WHEEL_EVENT for MAC_OSX as well
        as for WINDOWS_NT.
        (syms_of_keyboard): Initialize Qmouse_wheel for MAC_OSX.

        * termhooks.h (event_kind): Define MOUSE_WHEEL_EVENT also for
        MAC_OSX.

In lisp:

2002-08-03  Andrew Choi  <akochoi@shaw.ca>

        * term/mac-win.el: Set keys to enable mouse wheel support.

1 files changed, 9 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 27b596e30d2..58135b43dfa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,13 @@
-2002-08-03  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2002-08-03  Andrew Choi  <akochoi@shaw.ca>
+
+        * term/mac-win.el: Set keys to enable mouse wheel support.
+
+2002-08-03  Kai Gro,A_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
         * net/tramp.el: Version 2.0.8.
         (tramp-perl-encode, tramp-perl-encode): Double the backslashes.
 
-2002-08-03  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2002-08-03  Kai Gro,A_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
         * net/tramp.el: Version 2.0.7.
         (tramp-perl-encode-with-module, tramp-perl-decode-with-module) 
@@ -17,7 +21,7 @@
         (f90-font-lock-keywords-2): Fix `implicit type(foo)' case.
         (f90-type-def-re): Fix value.
 
-2002-08-03  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2002-08-03  Kai Gro,A_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
         * net/tramp.el: Version 2.0.6.
         (tramp-default-method): Change to "ssh" from "sm".
@@ -111,7 +115,7 @@
         (update-subdirs-CMD): Generate the right list of subdirectories.  From
         Tak Ota <Takaaki.Ota@am.sony.com>.
 
-2002-07-30  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2002-07-30  Kai Gro,A_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
         * net/tramp.el: New version 2.0.5.
         (tramp-methods): Remove inline encoding method parameters.  The
@@ -257,7 +261,7 @@
         * ps-print.el: Update copyright year.
         (ps-begin-cut-regexp, ps-end-cut-regexp): Fix type.
 
-2002-07-26  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2002-07-26  Kai Gro,A_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
         * eshell/eshell.el (eshell): Numeric prefix arg means to switch
         to the session with that number.  Old behavior still available