diff options
Diffstat (limited to 'doc')
| -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 | |||
| 1417 | explains how to customize key bindings, which is done by editing your | 1417 | explains how to customize key bindings, which is done by editing your |
| 1418 | init file (@pxref{Init Rebinding}). | 1418 | init file (@pxref{Init Rebinding}). |
| 1419 | 1419 | ||
| 1420 | @cindex reserved key bindings | ||
| 1421 | @cindex keys, reserved | ||
| 1420 | Since most modes define their own key bindings, activating a mode | 1422 | Since most modes define their own key bindings, activating a mode |
| 1421 | might override your custom key bindings. A small number of keys are | 1423 | might override your custom key bindings. A small number of keys are |
| 1422 | reserved for user-defined bindings, and should not be used by modes, | 1424 | 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 | |||
| 207 | @code{mouse-wheel-progressive-speed} determines whether the scroll | 207 | @code{mouse-wheel-progressive-speed} determines whether the scroll |
| 208 | speed is linked to how fast you move the wheel. | 208 | speed is linked to how fast you move the wheel. |
| 209 | 209 | ||
| 210 | @vindex mwheel-tilt-scroll-p | 210 | @vindex mouse-wheel-tilt-scroll |
| 211 | @vindex mwheel-flip-direction | 211 | @vindex mouse-wheel-flip-direction |
| 212 | Emacs can also support horizontal scrolling if your mouse's wheel can | 212 | Emacs can also support horizontal scrolling if your mouse's wheel can |
| 213 | be tilted. This feature is off by default; the variable | 213 | be tilted. This feature is off by default; the variable |
| 214 | @code{mwheel-tilt-scroll-p} turns it on. If you'd like to reverse the | 214 | @code{mouse-wheel-tilt-scroll} turns it on. If you'd like to reverse |
| 215 | direction of horizontal scrolling, customize the variable | 215 | the direction of horizontal scrolling, customize the variable |
| 216 | @code{mwheel-flip-direction} to a non-@code{nil} value. | 216 | @code{mouse-wheel-flip-direction} to a non-@code{nil} value. |
| 217 | 217 | ||
| 218 | 218 | ||
| 219 | @node Word and Line Mouse | 219 | @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. | |||
| 138 | @node Table of Resources | 138 | @node Table of Resources |
| 139 | @appendixsec Table of X Resources for Emacs | 139 | @appendixsec Table of X Resources for Emacs |
| 140 | 140 | ||
| 141 | This table lists the X resource names that Emacs recognizes, | 141 | The table below lists the X resource names that Emacs recognizes. |
| 142 | excluding those that control the appearance of graphical widgets like | 142 | Note that some of the resources have no effect in Emacs compiled with |
| 143 | the menu bar: | 143 | various X toolkits (GTK+, Lucid, etc.)---we indicate below when this |
| 144 | is the case. | ||
| 144 | 145 | ||
| 145 | @table @asis | 146 | @table @asis |
| 146 | @item @code{background} (class @code{Background}) | 147 | @item @code{background} (class @code{Background}) |