[Emacs-diffs] emacs/lisp ChangeLog term/ns-win.el term/w32-wi...

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/09/12 19:04:27

Modified files:
        lisp           : ChangeLog 
        lisp/term      : ns-win.el w32-win.el x-win.el 

Log message:
        * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16151&r2=1.16152
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/term/ns-win.el?cvsroot=emacs&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/term/w32-win.el?cvsroot=emacs&r1=1.111&r2=1.112
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/term/x-win.el?cvsroot=emacs&r1=1.241&r2=1.242

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16151
retrieving revision 1.16152
diff -u -b -r1.16151 -r1.16152
--- ChangeLog   12 Sep 2009 19:03:49 -0000      1.16151
+++ ChangeLog   12 Sep 2009 19:04:24 -0000      1.16152
@@ -1,5 +1,10 @@
 2009-09-12  Stefan Monnier  <address@hidden>
 
+       * 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

Index: term/ns-win.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/term/ns-win.el,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- term/ns-win.el      11 Sep 2009 03:41:29 -0000      1.50
+++ term/ns-win.el      12 Sep 2009 19:04:26 -0000      1.51
@@ -1253,7 +1253,6 @@
 
   ;; 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))
 

Index: term/w32-win.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/term/w32-win.el,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -b -r1.111 -r1.112
--- term/w32-win.el     19 Mar 2009 00:57:20 -0000      1.111
+++ term/w32-win.el     12 Sep 2009 19:04:26 -0000      1.112
@@ -305,9 +305,6 @@
   ;; 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)
 

Index: term/x-win.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/term/x-win.el,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -b -r1.241 -r1.242
--- term/x-win.el       25 Jul 2009 09:31:11 -0000      1.241
+++ term/x-win.el       12 Sep 2009 19:04:26 -0000      1.242
@@ -1573,9 +1573,6 @@
   ;; (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)