procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a recent documentation change

Browse source 
* doc/emacs/frames.texi (Mouse Commands): More detailed
description of how tilting the mouse-wheel works.

* lisp/mwheel.el (mouse-wheel-tilt-scroll)
(mouse-wheel-flip-direction): Fix the wording of doc strings.
(Bug#39979)
This commit is contained in:
Eli Zaretskii 2020-03-13 12:24:25 +02:00
parent 1ab766fd58
commit b468b3d1ff
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
doc/emacs/frames.texi
View file

@ -217,11 +217,15 @@ default bound to scrolling with the @key{Ctrl} modifier.
@vindex mouse-wheel-tilt-scroll @vindex mouse-wheel-tilt-scroll
@vindex mouse-wheel-flip-direction @vindex mouse-wheel-flip-direction
Emacs can also support horizontal scrolling if your mouse's wheel can Emacs can also support horizontal scrolling if your mouse's wheel can
be tilted, or your touchpad supports it. This feature is off by be tilted, or if your touchpad supports it. This feature is off by
default; the variable @code{mouse-wheel-tilt-scroll} turns it on. If default; the variable @code{mouse-wheel-tilt-scroll} turns it on, if
you'd like to reverse the direction of horizontal scrolling, customize you customize it to a non-@code{nil} value. By default, tilting the
the variable @code{mouse-wheel-flip-direction} to a non-@code{nil} mouse wheel scrolls the window's view horizontally in the direction of
value. the tilt: e.g., tilting to the right scrolls the window to the right,
so that the text displayed in the window moves horizontally to the
left. 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.
When the mouse pointer is over an image, scrolling the mouse wheel When the mouse pointer is over an image, scrolling the mouse wheel
with the @key{Ctrl} modifier scales the image under the mouse pointer. with the @key{Ctrl} modifier scales the image under the mouse pointer.

9
lisp/mwheel.el
View file

@ -145,7 +145,7 @@ face height."
;;; For tilt-scroll ;;; For tilt-scroll
;;; ;;;
(defcustom mouse-wheel-tilt-scroll nil (defcustom mouse-wheel-tilt-scroll nil
"Enable horizontal scrolling via mouse or touchpad. "Enable horizontal scrolling by tilting mouse wheel or via touchpad.
Also see `mouse-wheel-flip-direction'." Also see `mouse-wheel-flip-direction'."
:group 'mouse :group 'mouse
:type 'boolean :type 'boolean
@ -153,8 +153,11 @@ Also see `mouse-wheel-flip-direction'."
(defcustom mouse-wheel-flip-direction nil (defcustom mouse-wheel-flip-direction nil
"Swap direction of `wheel-right' and `wheel-left'. "Swap direction of `wheel-right' and `wheel-left'.
This inverts the direction of horizontal scrolling. Also see By default, `wheel-right' scrolls the text to the right,
`mouse-wheel-tilt-scroll'." and `wheel-left' scrolls in the other direction.
If this variable is non-nil, it inverts the direction of
horizontal scrolling by tilting the mouse wheel.
Also see `mouse-wheel-tilt-scroll'."
:group 'mouse :group 'mouse
:type 'boolean :type 'boolean
:version "26.1") :version "26.1")