diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-09-12 19:03:49 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-09-12 19:03:49 +0000 |
| commit | 0a4afea9b6d3b4283611ffabeb34f1fe1a737e45 (patch) | |
| tree | 95eae46eaf112c67b6b939b8460baf43cff1bb05 /lisp/mwheel.el | |
| parent | bf01513fff1644d22b7db6864de1539db7438c5a (diff) | |
| download | emacs-0a4afea9b6d3b4283611ffabeb34f1fe1a737e45.tar.gz | |
(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.
Diffstat (limited to 'lisp/mwheel.el')
| -rw-r--r-- | lisp/mwheel.el | 10 |
1 files changed, 6 insertions, 4 deletions
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))) |