[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 9f56d04: Merge from origin/emacs-26
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 9f56d04: Merge from origin/emacs-26 |
Date: |
Sat, 24 Feb 2018 12:45:40 -0500 (EST) |
branch: master
commit 9f56d04df40cac6767b7fbed89737ce9f03f5d80
Merge: 80c2bf6 560a23e
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Merge from origin/emacs-26
560a23e (origin/emacs-26) Document reserved keys
b0be19b ; * doc/emacs/xresources.texi (Table of Resources): Fix last ...
---
doc/emacs/custom.texi | 8 ++++++++
doc/emacs/xresources.texi | 10 +++++-----
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index 86e27b6..59cd57b 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -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.
diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi
index a0de313..096e747 100644
--- a/doc/emacs/xresources.texi
+++ b/doc/emacs/xresources.texi
@@ -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
address@hidden Resources}, and see @ref{GTK Resources}.)
address@hidden 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
address@hidden Resources}, and see @ref{GTK Resources}.)
address@hidden Resources}, and see @ref{GTK resources}.)
@item @code{selectionTimeout} (class @code{SelectionTimeout})
Number of milliseconds to wait for a selection reply.