(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.

1 files changed, 11 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aac2899a0ef..e50785feea4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2009-09-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * 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  <rgm@gnu.org>
 
         * 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  <eliz@gnu.org>