From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sat, 12 Sep 2009 19:04:24 +0000 (+0000)
Subject: * term/x-win.el (x-initialize-window-system):
X-Git-Tag: emacs-pretest-23.1.90~1349
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9f94990d7e0535af7b5eb111e01db6e1eba7c307;p=emacs.git

* term/x-win.el (x-initialize-window-system):
* term/w32-win.el (w32-initialize-window-system):
* term/ns-win.el (ns-initialize-window-system): Don't call
mouse-wheel-mode since it's enabled globally by default already.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e50785feea4..11787f8a7d3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2009-09-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* term/x-win.el (x-initialize-window-system):
+	* term/w32-win.el (w32-initialize-window-system):
+	* term/ns-win.el (ns-initialize-window-system): Don't call
+	mouse-wheel-mode since it's enabled globally by default already.
+
 	* mwheel.el (mouse-wheel-mode): Make sure the new defvar doesn't
 	actually define the variable, but only silences the byte-compiler.
 	(mouse-wheel-change-button): Check whether mouse-wheel-mode is bound
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index dd40b4b32f6..17ec9306fc8 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -1253,7 +1253,6 @@ the operating system.")
 
   ;; FIXME: This will surely lead to "MODIFIED OUTSIDE CUSTOM" warnings.
   (menu-bar-mode (if (get-lisp-resource nil "Menus") 1 -1))
-  (mouse-wheel-mode 1)
 
   (setq ns-initialized t))
 
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 4b8d48ce16b..28940802ab3 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -305,9 +305,6 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
   ;; that this is only annoying.
   (setq split-window-keep-point t)
 
-  ;; Turn on support for mouse wheels
-  (mouse-wheel-mode 1)
-
   ;; W32 expects the menu bar cut and paste commands to use the clipboard.
   (menu-bar-enable-clipboard)
 
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 17c0f3aef93..39eab12f2a7 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1573,9 +1573,6 @@ The value nil is the same as this list:
   ;; (if (featurep 'motif)
   ;;     (global-set-key [f10] 'ignore))
 
-  ;; Turn on support for mouse wheels.
-  (mouse-wheel-mode 1)
-
   ;; Enable CLIPBOARD copy/paste through menu bar commands.
   (menu-bar-enable-clipboard)