aboutsummaryrefslogtreecommitdiffstats
path: root/doc/lispref
diff options
context:
space:
mode:
authorChong Yidong2012-10-23 10:23:39 +0800
committerChong Yidong2012-10-23 10:23:39 +0800
commit1fb3aa3fead098e7df1428c7a70e3a32f1da23e4 (patch)
tree9e1c867779f3438bdf12a5a7764c8359cac84d27 /doc/lispref
parent608d9d7caf59345fafdb4d412a1706e7028e1c3c (diff)
downloademacs-1fb3aa3fead098e7df1428c7a70e3a32f1da23e4.tar.gz
emacs-1fb3aa3fead098e7df1428c7a70e3a32f1da23e4.zip
* doc/lispref/keymaps.texi (Key Sequences): Avoid referring to Edit Macro mode.
* doc/emacs/kmacro.texi (Edit Keyboard Macro): Fix typo. Fixes: debbugs:12529
Diffstat (limited to 'doc/lispref')
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/keymaps.texi10
2 files changed, 10 insertions, 5 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 76d0452b9e7..c18c29d6d63 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
12012-10-23 Chong Yidong <cyd@gnu.org>
2
3 * keymaps.texi (Key Sequences): Avoid referring to Edit Macro mode
4 (Bug#12529).
5
12012-10-22 Glenn Morris <rgm@gnu.org> 62012-10-22 Glenn Morris <rgm@gnu.org>
2 7
3 * os.texi (Recording Input): Tiny fix. 8 * os.texi (Recording Input): Tiny fix.
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index 40dfcaea043..9fa6193a804 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -78,11 +78,11 @@ representations, @ref{Init Rebinding,,, emacs, The GNU Emacs Manual}.
78@defmac kbd keyseq-text 78@defmac kbd keyseq-text
79This macro converts the text @var{keyseq-text} (a string constant) 79This macro converts the text @var{keyseq-text} (a string constant)
80into a key sequence (a string or vector constant). The contents of 80into a key sequence (a string or vector constant). The contents of
81@var{keyseq-text} should describe the key sequence using almost the same 81@var{keyseq-text} should use the same syntax as in the buffer invoked
82syntax used in this manual. More precisely, it uses the same syntax 82by the @kbd{C-x C-k @key{RET}} (@code{kmacro-edit-macro}) command; in
83that Edit Macro mode uses for editing keyboard macros (@pxref{Edit 83particular, you must surround function key names with
84Keyboard Macro,,, emacs, The GNU Emacs Manual}); you must surround 84@samp{<@dots{}>}. @xref{Edit Keyboard Macro,,, emacs, The GNU Emacs
85function key names with @samp{<@dots{}>}. 85Manual}.
86 86
87@example 87@example
88(kbd "C-x") @result{} "\C-x" 88(kbd "C-x") @result{} "\C-x"