aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2012-12-21 10:56:18 +0800
committerChong Yidong2012-12-21 10:56:18 +0800
commit6e55f03e36c38571ff69992db797c841110d6a1b (patch)
tree5c64a89345b175533327adc004f6d326f1532ecc
parentacc650b8065f34fe02f3a42b3e0335e287a66e18 (diff)
downloademacs-6e55f03e36c38571ff69992db797c841110d6a1b.tar.gz
emacs-6e55f03e36c38571ff69992db797c841110d6a1b.zip
* customize.texi (Simple Types): Document key-sequence type.
Fixes: debbugs:13048
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/customize.texi5
2 files changed, 10 insertions, 0 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 9aeff403ec3..355ac4f9145 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
12012-12-21 Chong Yidong <cyd@gnu.org>
2
3 * customize.texi (Simple Types): Document key-sequence type
4 (Bug#13048).
5
12012-12-15 Chong Yidong <cyd@gnu.org> 62012-12-15 Chong Yidong <cyd@gnu.org>
2 7
3 * strings.texi (Text Comparison): Doc fix for compare-strings. 8 * strings.texi (Text Comparison): Doc fix for compare-strings.
diff --git a/doc/lispref/customize.texi b/doc/lispref/customize.texi
index 14076fe9408..cb48f6f284e 100644
--- a/doc/lispref/customize.texi
+++ b/doc/lispref/customize.texi
@@ -618,6 +618,11 @@ you can specify that the value must be @code{nil} or @code{t}, but also
618specify the text to describe each value in a way that fits the specific 618specify the text to describe each value in a way that fits the specific
619meaning of the alternative. 619meaning of the alternative.
620 620
621@item key-sequence
622The value is a key sequence. The customization buffer shows the key
623sequence using the same syntax as the @kbd{kbd} function. @xref{Key
624Sequences}.
625
621@item coding-system 626@item coding-system
622The value must be a coding-system name, and you can do completion with 627The value must be a coding-system name, and you can do completion with
623@kbd{M-@key{TAB}}. 628@kbd{M-@key{TAB}}.