diff options
| author | Glenn Morris | 2020-03-13 07:50:33 -0700 |
|---|---|---|
| committer | Glenn Morris | 2020-03-13 07:50:33 -0700 |
| commit | 6bdb561a3bafa0623da30e33b4a1dc291370218b (patch) | |
| tree | f3fe23d6771aab9bd9f7df6822af4ea1f4dd39af /doc | |
| parent | 099520ec95baad177f58a687d70818bc8f602703 (diff) | |
| parent | a2b07f9f11474dbcedd7cce39d2fa795bb23f692 (diff) | |
| download | emacs-6bdb561a3bafa0623da30e33b4a1dc291370218b.tar.gz emacs-6bdb561a3bafa0623da30e33b4a1dc291370218b.zip | |
Merge from origin/emacs-27
a2b07f9f11 (origin/emacs-27) ; * etc/NEWS: Explain how to get back ol...
b468b3d1ff Fix a recent documentation change
1ab766fd58 Fix last change
ecfe633993 * lisp/tab-bar.el: Last-minute changes.
c1ce9fa7f2 * lisp/subr.el (cancel-change-group): Fix bug#39680
ef5744a988 Improve docs for horizontal scrolling with mouse and touch...
1bc3fa0bd0 * lisp/emacs-lisp/package.el (package-install): Fix typo i...
4537976afd Port .gdbinit to clang with -gdwarf-4
0883c800a0 Simplify rx example in manual
a695189248 ; * etc/NEWS: Fix typo.
# Conflicts:
# etc/NEWS
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/frames.texi | 13 | ||||
| -rw-r--r-- | doc/lispref/searching.texi | 4 |
2 files changed, 11 insertions, 6 deletions
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi index 002297c2599..7a583b96bbd 100644 --- a/doc/emacs/frames.texi +++ b/doc/emacs/frames.texi | |||
| @@ -217,10 +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 |
| 219 | Emacs can also support horizontal scrolling if your mouse's wheel can | 219 | Emacs can also support horizontal scrolling if your mouse's wheel can |
| 220 | be tilted. This feature is off by default; the variable | 220 | be tilted, or if your touchpad supports it. This feature is off by |
| 221 | @code{mouse-wheel-tilt-scroll} turns it on. If you'd like to reverse | 221 | default; the variable @code{mouse-wheel-tilt-scroll} turns it on, if |
| 222 | the direction of horizontal scrolling, customize the variable | 222 | you customize it to a non-@code{nil} value. By default, tilting the |
| 223 | @code{mouse-wheel-flip-direction} to a non-@code{nil} value. | 223 | mouse wheel scrolls the window's view horizontally in the direction of |
| 224 | the tilt: e.g., tilting to the right scrolls the window to the right, | ||
| 225 | so that the text displayed in the window moves horizontally to the | ||
| 226 | left. If you'd like to reverse the direction of horizontal scrolling, | ||
| 227 | customize the variable @code{mouse-wheel-flip-direction} to a | ||
| 228 | non-@code{nil} value. | ||
| 224 | 229 | ||
| 225 | When the mouse pointer is over an image, scrolling the mouse wheel | 230 | When the mouse pointer is over an image, scrolling the mouse wheel |
| 226 | with the @key{Ctrl} modifier scales the image under the mouse pointer. | 231 | with the @key{Ctrl} modifier scales the image under the mouse pointer. |
diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi index 1a090ebe101..83c154938cd 100644 --- a/doc/lispref/searching.texi +++ b/doc/lispref/searching.texi | |||
| @@ -1021,8 +1021,8 @@ or, using shorter synonyms and written more compactly, | |||
| 1021 | @example | 1021 | @example |
| 1022 | @group | 1022 | @group |
| 1023 | (rx "/*" | 1023 | (rx "/*" |
| 1024 | (* (| (not (any "*")) | 1024 | (* (| (not "*") |
| 1025 | (: "*" (not (any "/"))))) | 1025 | (: "*" (not "/")))) |
| 1026 | (+ "*") "/") | 1026 | (+ "*") "/") |
| 1027 | @end group | 1027 | @end group |
| 1028 | @end example | 1028 | @end example |