diff options
| author | Tak Kunihiro <tkk@misasa.okayama-u.ac.jp> | 2018-03-01 20:44:22 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-03-01 20:44:22 -0500 |
| commit | 3968f72be861b3ee1de590b1ef53f9fb56f3640e (patch) | |
| tree | 4cde3b749141f45e8e81cc9e7cee13869a3af5b4 | |
| parent | d6e78de50bac51da6927ca511cca2d6a176793bb (diff) | |
| download | emacs-3968f72be861b3ee1de590b1ef53f9fb56f3640e.tar.gz | |
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.
| -rw-r--r-- | doc/emacs/frames.texi | 10 | ||||
| -rw-r--r-- | etc/NEWS | 4 | ||||
| -rw-r--r-- | lisp/mwheel.el | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi index 17f6f35a8a3..11611e73516 100644 --- a/doc/emacs/frames.texi +++ b/doc/emacs/frames.texi @@ -207,13 +207,13 @@ buffers are scrolled. The variable @code{mouse-wheel-progressive-speed} determines whether the scroll speed is linked to how fast you move the wheel. -@vindex mwheel-tilt-scroll-p -@vindex mwheel-flip-direction +@vindex mouse-wheel-tilt-scroll +@vindex mouse-wheel-flip-direction Emacs can also support horizontal scrolling if your mouse's wheel can be tilted. This feature is off by default; the variable -@code{mwheel-tilt-scroll-p} turns it on. If you'd like to reverse the -direction of horizontal scrolling, customize the variable -@code{mwheel-flip-direction} to a non-@code{nil} value. +@code{mouse-wheel-tilt-scroll} turns it on. If you'd like to reverse +the direction of horizontal scrolling, customize the variable +@code{mouse-wheel-flip-direction} to a non-@code{nil} value. @node Word and Line Mouse @@ -431,9 +431,9 @@ always restricting the margin to a quarter of the window. +++ ** Emacs can scroll horizontally using mouse, touchpad, and trackbar. -You can enable this by customizing 'mwheel-tilt-scroll-p'. If you +You can enable this by customizing 'mouse-wheel-tilt-scroll'. If you want to reverse the direction of the scroll, customize -'mwheel-flip-direction'. +'mouse-wheel-flip-direction'. +++ ** The default GnuTLS priority string now includes %DUMBFW. 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 |