(mouse-wheel-down-event, mouse-wheel-up-event):

Default to new wheel-up and wheel-down events on MacOS.

diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index 2ebb10c3073d035e402bd7503e25abb1772a0079..365875745237a67cc3adee3eee6f542d22b2edfa 100644 (file)
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -58,7 +58,7 @@
                         'mouse-wheel-down-event)
 (defcustom mouse-wheel-down-event
   ;; In the latest versions of XEmacs, we could just use mouse-%s as well.
-  (if (eq system-type 'windows-nt)
+  (if (memq system-type '(windows-nt macos))
       'wheel-up
     (intern (format (if (featurep 'xemacs) "button%s" "mouse-%s")
                    mouse-wheel-down-button)))
@@ -72,7 +72,7 @@
                         'mouse-wheel-up-event)
 (defcustom mouse-wheel-up-event
   ;; In the latest versions of XEmacs, we could just use mouse-%s as well.
-  (if (eq system-type 'windows-nt)
+  (if (memq system-type '(windows-nt macos))
       'wheel-down
     (intern (format (if (featurep 'xemacs) "button%s" "mouse-%s")
                    mouse-wheel-up-button)))