[Emacs-diffs] emacs/lisp ChangeLog mwheel.el

[Stefan Monnier]

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

Modified files:
        lisp           : ChangeLog mwheel.el 

Log message:
        (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
        before looking it up.
        (mouse-wheel-scroll-amount): Also reset the bindings if this value is 
changed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16150&r2=1.16151
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mwheel.el?cvsroot=emacs&r1=1.55&r2=1.56

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16150
retrieving revision 1.16151
diff -u -b -r1.16150 -r1.16151
--- ChangeLog   12 Sep 2009 18:48:22 -0000      1.16150
+++ ChangeLog   12 Sep 2009 19:03:49 -0000      1.16151
@@ -1,3 +1,12 @@
+2009-09-12  Stefan Monnier  <address@hidden>
+
+       * 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
+       before looking it up.
+       (mouse-wheel-scroll-amount): Also reset the bindings if this value
+       is changed.
+
 2009-09-12  Glenn Morris  <address@hidden>
 
        * emacs-lisp/elint.el (elint-file): Make max-lisp-eval-depth at least
@@ -19,8 +28,8 @@
        (epg-receive-keys, epg-import-keys-from-server)
        (epg-start-delete-keys, epg-delete-keys, epg-start-sign-keys)
        (epg-sign-keys, epg-start-generate-key)
-       (epg-generate-key-from-file, epg-generate-key-from-string): Remove
-       autoload cookie.
+       (epg-generate-key-from-file, epg-generate-key-from-string):
+       Remove autoload cookie.
 
 2009-09-12  Eli Zaretskii  <address@hidden>
 

Index: mwheel.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mwheel.el,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- mwheel.el   12 Sep 2009 09:39:49 -0000      1.55
+++ mwheel.el   12 Sep 2009 19:03:52 -0000      1.56
@@ -41,7 +41,7 @@
 (require 'custom)
 (require 'timer)
 
-(defvar mouse-wheel-mode nil)
+(defvar mouse-wheel-mode)
 
 ;; Setter function for mouse-button user-options.  Switch Mouse Wheel
 ;; mode off and on again so that the old button is unbound and
@@ -50,7 +50,7 @@
 (defun mouse-wheel-change-button (var button)
   (set-default var button)
   ;; Sync the bindings.
-  (when mouse-wheel-mode (mouse-wheel-mode 1)))
+  (when (bound-and-true-p mouse-wheel-mode) (mouse-wheel-mode 1)))
 
 (defvar mouse-wheel-down-button 4)
 (make-obsolete-variable 'mouse-wheel-down-button
@@ -131,7 +131,8 @@
             (choice :tag "scroll amount"
                     (const :tag "Full screen" :value nil)
                     (integer :tag "Specific # of lines")
-                    (float :tag "Fraction of window"))))))
+                    (float :tag "Fraction of window")))))
+  :set 'mouse-wheel-change-button)
 
 (defcustom mouse-wheel-progressive-speed t
   "If non-nil, the faster the user moves the wheel, the faster the scrolling.
@@ -241,6 +242,7 @@
 
 (defvar mwheel-installed-bindings nil)
 
+;; preloaded ;;;###autoload
 (define-minor-mode mouse-wheel-mode
   "Toggle mouse wheel support.
 With prefix argument ARG, turn on if positive, otherwise off.
@@ -267,7 +269,7 @@
         (push key mwheel-installed-bindings)))))
 
 ;;; Compatibility entry point
-;;;###autoload
+;; preloaded ;;;###autoload
 (defun mwheel-install (&optional uninstall)
   "Enable mouse wheel support."
   (mouse-wheel-mode (if uninstall -1 1)))