aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2020-03-13 12:24:25 +0200
committerEli Zaretskii2020-03-13 12:24:25 +0200
commitb468b3d1ffa9f22a8a421b1037f7e397903913c3 (patch)
treee3c60ddcb0d069f8f690ec34f198c6f12047c0bc
parent1ab766fd5814ee30d810fb82c0db6eb66320ec3d (diff)
downloademacs-b468b3d1ffa9f22a8a421b1037f7e397903913c3.tar.gz
emacs-b468b3d1ffa9f22a8a421b1037f7e397903913c3.zip
Fix a recent documentation change
* 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)
-rw-r--r--doc/emacs/frames.texi14
-rw-r--r--lisp/mwheel.el9
2 files changed, 15 insertions, 8 deletions
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 16205e6e0c3..7a583b96bbd 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -217,11 +217,15 @@ default bound to scrolling with the @key{Ctrl} modifier.
217@vindex mouse-wheel-tilt-scroll 217@vindex mouse-wheel-tilt-scroll
218@vindex mouse-wheel-flip-direction 218@vindex mouse-wheel-flip-direction
219Emacs can also support horizontal scrolling if your mouse's wheel can 219Emacs can also support horizontal scrolling if your mouse's wheel can
220be tilted, or your touchpad supports it. This feature is off by 220be tilted, or if your touchpad supports it. This feature is off by
221default; the variable @code{mouse-wheel-tilt-scroll} turns it on. If 221default; the variable @code{mouse-wheel-tilt-scroll} turns it on, if
222you'd like to reverse the direction of horizontal scrolling, customize 222you customize it to a non-@code{nil} value. By default, tilting the
223the variable @code{mouse-wheel-flip-direction} to a non-@code{nil} 223mouse wheel scrolls the window's view horizontally in the direction of
224value. 224the tilt: e.g., tilting to the right scrolls the window to the right,
225so that the text displayed in the window moves horizontally to the
226left. If you'd like to reverse the direction of horizontal scrolling,
227customize the variable @code{mouse-wheel-flip-direction} to a
228non-@code{nil} value.
225 229
226When the mouse pointer is over an image, scrolling the mouse wheel 230When the mouse pointer is over an image, scrolling the mouse wheel
227with the @key{Ctrl} modifier scales the image under the mouse pointer. 231with the @key{Ctrl} modifier scales the image under the mouse pointer.
diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index 79977ef8640..317f2cd8edd 100644
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -145,7 +145,7 @@ face height."
145;;; For tilt-scroll 145;;; For tilt-scroll
146;;; 146;;;
147(defcustom mouse-wheel-tilt-scroll nil 147(defcustom mouse-wheel-tilt-scroll nil
148 "Enable horizontal scrolling via mouse or touchpad. 148 "Enable horizontal scrolling by tilting mouse wheel or via touchpad.
149Also see `mouse-wheel-flip-direction'." 149Also see `mouse-wheel-flip-direction'."
150 :group 'mouse 150 :group 'mouse
151 :type 'boolean 151 :type 'boolean
@@ -153,8 +153,11 @@ Also see `mouse-wheel-flip-direction'."
153 153
154(defcustom mouse-wheel-flip-direction nil 154(defcustom mouse-wheel-flip-direction nil
155 "Swap direction of `wheel-right' and `wheel-left'. 155 "Swap direction of `wheel-right' and `wheel-left'.
156This inverts the direction of horizontal scrolling. Also see 156By default, `wheel-right' scrolls the text to the right,
157`mouse-wheel-tilt-scroll'." 157and `wheel-left' scrolls in the other direction.
158If this variable is non-nil, it inverts the direction of
159horizontal scrolling by tilting the mouse wheel.
160Also see `mouse-wheel-tilt-scroll'."
158 :group 'mouse 161 :group 'mouse
159 :type 'boolean 162 :type 'boolean
160 :version "26.1") 163 :version "26.1")