diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-03-02 11:59:46 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-03-02 11:59:46 -0800 |
| commit | 762ea10d7ff483d3528c2c85b42596178ccc2a34 (patch) | |
| tree | 00154b726c2bd73c85d47f89a2912bd2ff389b92 /doc/emacs | |
| parent | e943b9b514fcc82a47364a35e4af9f46e30e7346 (diff) | |
| parent | 0213c8bf472b196d995d92a52b44458ac8226e42 (diff) | |
| download | emacs-762ea10d7ff483d3528c2c85b42596178ccc2a34.tar.gz | |
Merge from origin/emacs-26
0213c8b (origin/emacs-26) mwheel minor consistency fix
82f12b2 * src/window.c (Frecenter): Improve commentary.
04da8f4 Fix downloading non-text files in EWW
832b9ec ; Spelling fixes
dd88499 ; Spelling fixes
3968f72 Rename some mwheel options, for consistency
d6e78de * lisp/vc/add-log.el (add-change-log-entry): Replace obsolete...
5fe0387 Improve the Emacs manual
56ab8e3 * lisp/dired-aux.el (dired-do-create-files): Doc fix. (Bug#3...
Conflicts:
etc/NEWS
lisp/mwheel.el
Diffstat (limited to 'doc/emacs')
| -rw-r--r-- | doc/emacs/custom.texi | 2 | ||||
| -rw-r--r-- | doc/emacs/frames.texi | 10 | ||||
| -rw-r--r-- | doc/emacs/xresources.texi | 7 |
3 files changed, 11 insertions, 8 deletions
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index 7d90c20a2a9..0905ae7bb12 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -1417,6 +1417,8 @@ commands, and @dfn{keymaps}, which record key bindings. It also explains how to customize key bindings, which is done by editing your init file (@pxref{Init Rebinding}). +@cindex reserved key bindings +@cindex keys, reserved Since most modes define their own key bindings, activating a mode might override your custom key bindings. A small number of keys are reserved for user-defined bindings, and should not be used by modes, 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 diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi index 8d0127f9103..db2c6ffafd2 100644 --- a/doc/emacs/xresources.texi +++ b/doc/emacs/xresources.texi @@ -138,9 +138,10 @@ specifications. @node Table of Resources @appendixsec Table of X Resources for Emacs - This table lists the X resource names that Emacs recognizes, -excluding those that control the appearance of graphical widgets like -the menu bar: + The table below lists the X resource names that Emacs recognizes. +Note that some of the resources have no effect in Emacs compiled with +various X toolkits (GTK+, Lucid, etc.)---we indicate below when this +is the case. @table @asis @item @code{background} (class @code{Background}) |