From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Fri, 4 Nov 2005 02:15:37 +0000 (+0000)
Subject: (mouse-wheel-down-event, mouse-wheel-up-event): Undo previous change.
X-Git-Tag: emacs-pretest-22.0.90~6073
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bf03bdf3bf9a71d9df3c64f32f216eef6c7d0f07;p=emacs.git

(mouse-wheel-down-event, mouse-wheel-up-event): Undo previous change.
---

diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index c4e604bfd6e..391ce3a5e04 100644
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -59,7 +59,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 (memq system-type '(windows-nt macos))
+  (if (memq window-system '(w32 mac))
       'wheel-up
     (intern (format (if (featurep 'xemacs) "button%s" "mouse-%s")
 		    mouse-wheel-down-button)))
@@ -73,7 +73,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 (memq system-type '(windows-nt macos))
+  (if (memq window-system '(w32 mac))
       'wheel-down
     (intern (format (if (featurep 'xemacs) "button%s" "mouse-%s")
 		    mouse-wheel-up-button)))