master 8b36ebc: Remove XEmacs compat code from mwheel.el

[Stefan Kangas]

branch: master
commit 8b36ebc95072c6a07d8dc4a74de231f740d7199b
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    Remove XEmacs compat code from mwheel.el
    
    * lisp/mwheel.el (mwheel-event-button, mwheel-event-window):
    Remove XEmacs compat code.
---
 lisp/mwheel.el | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index 317f2cd..8e2039b 100644
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -162,23 +162,18 @@ Also see `mouse-wheel-tilt-scroll'."
   :type 'boolean
   :version "26.1")
 
-(eval-and-compile
-  (if (fboundp 'event-button)
-      (fset 'mwheel-event-button 'event-button)
-    (defun mwheel-event-button (event)
-      (let ((x (event-basic-type event)))
-       ;; Map mouse-wheel events to appropriate buttons
-       (if (eq 'mouse-wheel x)
-           (let ((amount (car (cdr (cdr (cdr event))))))
-             (if (< amount 0)
-                 mouse-wheel-up-event
-               mouse-wheel-down-event))
-         x))))
-
-  (if (fboundp 'event-window)
-      (fset 'mwheel-event-window 'event-window)
-    (defun mwheel-event-window (event)
-      (posn-window (event-start event)))))
+(defun mwheel-event-button (event)
+  (let ((x (event-basic-type event)))
+    ;; Map mouse-wheel events to appropriate buttons
+    (if (eq 'mouse-wheel x)
+        (let ((amount (car (cdr (cdr (cdr event))))))
+          (if (< amount 0)
+              mouse-wheel-up-event
+            mouse-wheel-down-event))
+      x)))
+
+(defun mwheel-event-window (event)
+  (posn-window (event-start event)))
 
 (defvar mwheel-inhibit-click-event-timer nil
   "Timer running while mouse wheel click event is inhibited.")