diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 13 | ||||
| -rw-r--r-- | lisp/mwheel.el | 10 |
2 files changed, 17 insertions, 6 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> diff --git a/lisp/mwheel.el b/lisp/mwheel.el index 31e26c14487..ad500443b3e 100644 --- a/lisp/mwheel.el +++ b/lisp/mwheel.el @@ -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 @@ less than a full screen." (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 @@ This should only be bound to mouse buttons 4 and 5." (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 @@ Return non-nil if the new state is enabled." (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))) |