summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorTak Kunihiro <tkk@misasa.okayama-u.ac.jp>2018-03-01 20:44:22 -0500
committerGlenn Morris <rgm@gnu.org>2018-03-01 20:44:22 -0500
commit3968f72be861b3ee1de590b1ef53f9fb56f3640e (patch)
tree4cde3b749141f45e8e81cc9e7cee13869a3af5b4 /lisp
parentd6e78de50bac51da6927ca511cca2d6a176793bb (diff)
downloademacs-3968f72be861b3ee1de590b1ef53f9fb56f3640e.tar.gz
emacs-3968f72be861b3ee1de590b1ef53f9fb56f3640e.tar.bz2
emacs-3968f72be861b3ee1de590b1ef53f9fb56f3640e.zip
Rename some mwheel options, for consistency
* lisp/mwheel.el (mouse-wheel-tilt-scroll) (mouse-wheel-flip-direction): Rename from mwheel-tilt-scroll-p, mwheel-flip-direction. (mwheel-scroll): Update for option renaming. * doc/emacs/frames.texi (Mouse Commands): Update for option renaming.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/mwheel.el12
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index 9718ab87d39..7107d64aa1a 100644
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -255,13 +255,13 @@ non-Windows systems."
;; Make sure we do indeed scroll to the end of the buffer.
(end-of-buffer (while t (funcall mwheel-scroll-up-function)))))
((eq button mouse-wheel-left-event) ; for tilt scroll
- (when mwheel-tilt-scroll-p
- (funcall (if mwheel-flip-direction
+ (when mouse-wheel-tilt-scroll
+ (funcall (if mouse-wheel-flip-direction
mwheel-scroll-right-function
mwheel-scroll-left-function) amt)))
((eq button mouse-wheel-right-event) ; for tilt scroll
- (when mwheel-tilt-scroll-p
- (funcall (if mwheel-flip-direction
+ (when mouse-wheel-tilt-scroll
+ (funcall (if mouse-wheel-flip-direction
mwheel-scroll-left-function
mwheel-scroll-right-function) amt)))
(t (error "Bad binding in mwheel-scroll"))))
@@ -324,13 +324,13 @@ the mode if ARG is omitted or nil."
;;; For tilt-scroll
;;;
-(defcustom mwheel-tilt-scroll-p nil
+(defcustom mouse-wheel-tilt-scroll nil
"Enable scroll using tilting mouse wheel."
:group 'mouse
:type 'boolean
:version "26.1")
-(defcustom mwheel-flip-direction nil
+(defcustom mouse-wheel-flip-direction nil
"Swap direction of 'wheel-right and 'wheel-left."
:group 'mouse
:type 'boolean