summaryrefslogtreecommitdiff
path: root/doc/lispref/customize.texi
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-12-21 11:32:43 -0800
committerGlenn Morris <rgm@gnu.org>2012-12-21 11:32:43 -0800
commita4b0cca119b01dc55bad802ef696c857fe014482 (patch)
treef2df86b3d472d15d3bbb69274325a7c0090f65b3 /doc/lispref/customize.texi
parent0e9c7693712014196946a83709a83c08a7dfea25 (diff)
parent160b3852018831b830a7451f29f770fb49810342 (diff)
downloademacs-a4b0cca119b01dc55bad802ef696c857fe014482.tar.gz
emacs-a4b0cca119b01dc55bad802ef696c857fe014482.tar.bz2
emacs-a4b0cca119b01dc55bad802ef696c857fe014482.zip
Merge from emacs-24; up to 2012-12-01T13:25:13Z!cyd@gnu.org
Diffstat (limited to 'doc/lispref/customize.texi')
-rw-r--r--doc/lispref/customize.texi5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/lispref/customize.texi b/doc/lispref/customize.texi
index 56e091eabf2..498d2a379c0 100644
--- a/doc/lispref/customize.texi
+++ b/doc/lispref/customize.texi
@@ -620,6 +620,11 @@ you can specify that the value must be @code{nil} or @code{t}, but also
specify the text to describe each value in a way that fits the specific
meaning of the alternative.
+@item key-sequence
+The value is a key sequence. The customization buffer shows the key
+sequence using the same syntax as the @kbd{kbd} function. @xref{Key
+Sequences}.
+
@item coding-system
The value must be a coding-system name, and you can do completion with
@kbd{M-@key{TAB}}.