From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sun, 21 Jan 2024 04:12:36 +0000 (-0500)
Subject: * lisp/mwheel.el (mouse-wheel-obey-old-style-wheel-buttons): Simplify
X-Git-Tag: archive/raspbian/1%30.1+1-3+rpi1^2~2^2~20^2~2873
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=eca7368039d841993ba649bc144017598592fa56;p=emacs.git

* lisp/mwheel.el (mouse-wheel-obey-old-style-wheel-buttons): Simplify
---

diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index fc1f8e8b6d6..d3cdab87e84 100644
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -56,16 +56,7 @@
              (bound-and-true-p mouse-wheel-mode))
     (mouse-wheel-mode 1)))
 
-(defvar mouse-wheel-obey-old-style-wheel-buttons
-  ;; FIXME: Yuck!
-  (if (or (featurep 'w32-win) (featurep 'ns-win)
-          (featurep 'haiku-win) (featurep 'pgtk-win)
-          (featurep 'android-win))
-      (if (featurep 'xinput2)
-          nil
-        (unless (featurep 'x)
-          t))
-    t)
+(defvar mouse-wheel-obey-old-style-wheel-buttons t
   "If non-nil, treat mouse-4/5/6/7 events as mouse wheel events.
 These are the event names used historically in X11 before XInput2.
 They are sometimes generated by things like `xterm-mouse-mode' as well.")