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

Merge from origin/emacs-26

Browse source 
560a23e (origin/emacs-26) Document reserved keys
b0be19b ; * doc/emacs/xresources.texi (Table of Resources): Fix last ...
This commit is contained in:
Glenn Morris 2018-02-24 09:44:13 -08:00
commit 9f56d04df4
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/emacs/custom.texi
View file

@ -1417,6 +1417,14 @@ 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}).
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,
so key bindings using those keys are safer in this regard. The
reserved key sequences are those consisting of @kbd{C-c} followed by a
letter (either upper or lower case), and function keys @key{F5}
through @key{F9} without modifiers (@pxref{Modifier Keys}).
@menu
* Keymaps:: Generalities. The global keymap.
* Prefix Keymaps:: Keymaps for prefix keys.

10
doc/emacs/xresources.texi
View file

@ -221,7 +221,7 @@ Additional space between lines, in pixels.
@cindex background for menus
The background color of the menus in non-toolkit versions of Emacs.
(For toolkit versions, see @ref{Lucid Resources}, also see @ref{Motif
Resources}, and see @ref{GTK Resources}.)
Resources}, and see @ref{GTK resources}.)
@end ifnottex
@item @code{menuBar} (class @code{MenuBar})
@ -238,13 +238,13 @@ will use a separate minibuffer frame instead.
@cindex font for menus
Font name for menu pane titles, in non-toolkit versions of Emacs.
(For toolkit versions, see @ref{Lucid Resources}, also see @ref{Motif
Resources}, and see @ref{GTK Resources}.)
Resources}, and see @ref{GTK resources}.)
@item @code{paneForeground} (class @code{Foreground})
@cindex foreground for menus
Foreground color for menu pane titles, in non-toolkit versions of
Emacs. (For toolkit versions, see @ref{Lucid Resources}, also see
@ref{Motif Resources}, and see @ref{GTK Resources}.)
@ref{Motif Resources}, and see @ref{GTK resources}.)
@end ifnottex
@item @code{pointerColor} (class @code{Foreground})
@ -282,12 +282,12 @@ compiled with GTK+ support.
@item @code{selectionFont} (class @code{SelectionFont})
Font name for pop-up menu items, in non-toolkit versions of Emacs. (For
toolkit versions, see @ref{Lucid Resources}, also see @ref{Motif
Resources}, and see @ref{GTK Resources}.)
Resources}, and see @ref{GTK resources}.)
@item @code{selectionForeground} (class @code{SelectionForeground})
Foreground color for pop-up menu items, in non-toolkit versions of
Emacs. (For toolkit versions, see @ref{Lucid Resources}, also see
@ref{Motif Resources}, and see @ref{GTK Resources}.)
@ref{Motif Resources}, and see @ref{GTK resources}.)
@item @code{selectionTimeout} (class @code{SelectionTimeout})
Number of milliseconds to wait for a selection reply.