* 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 e50785feea41eb9d87051d100b32d3d0d07c3330..11787f8a7d3896e514ea7379fce2dd80340b0515 100644 (file)
--- 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 dd40b4b32f67d786e36d0e0f82a3d221b95ed445..17ec9306fc891c33c2a37428eb8fd82386ce7ab7 100644 (file)
--- 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 4b8d48ce16b66540d17d6f53a2aab47704f5fb71..28940802ab36e0c7dc16bc3441df6f239d5dfe65 100644 (file)
--- 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 17c0f3aef93293bec4c6bc698969f49f2b6da88b..39eab12f2a7478021e8011a1bba5f8cc90c4b417 100644 (file)
--- 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)