From 1fb3aa3fead098e7df1428c7a70e3a32f1da23e4 Mon Sep 17 00:00:00 2001
From: Chong Yidong <cyd@gnu.org>
Date: Tue, 23 Oct 2012 10:23:39 +0800
Subject: [PATCH] * doc/lispref/keymaps.texi (Key Sequences): Avoid referring
to Edit Macro mode.
* doc/emacs/kmacro.texi (Edit Keyboard Macro): Fix typo.
Fixes: debbugs:12529
---
doc/emacs/ChangeLog | 4 ++++
doc/emacs/kmacro.texi | 9 +++++----
doc/lispref/ChangeLog | 5 +++++
doc/lispref/keymaps.texi | 10 +++++-----
4 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 66bb2de921b..f1a3cdb6235 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-23 Chong Yidong <cyd@gnu.org>
+
+ * kmacro.texi (Edit Keyboard Macro): Fix typo.
+
2012-10-18 Dani Moncayo <dmoncayo@gmail.com>
* mini.texi (Completion Options): Fix off-by-one error. (Bug#12644)
diff --git a/doc/emacs/kmacro.texi b/doc/emacs/kmacro.texi
index 7a3f3151e5c..3b83d24e405 100644
--- a/doc/emacs/kmacro.texi
+++ b/doc/emacs/kmacro.texi
@@ -482,10 +482,11 @@ Edit the last 300 keystrokes as a keyboard macro
@kindex C-x C-k C-e
@kindex C-x C-k RET
You can edit the last keyboard macro by typing @kbd{C-x C-k C-e} or
-@kbd{C-x C-k RET} (@code{kmacro-edit-macro}). This formats the macro
-definition in a buffer and enters a specialized major mode for editing
-it. Type @kbd{C-h m} once in that buffer to display details of how to
-edit the macro. When you are finished editing, type @kbd{C-c C-c}.
+@kbd{C-x C-k @key{RET}} (@code{kmacro-edit-macro}). This formats the
+macro definition in a buffer and enters a specialized major mode for
+editing it. Type @kbd{C-h m} once in that buffer to display details
+of how to edit the macro. When you are finished editing, type
+@kbd{C-c C-c}.
@findex edit-kbd-macro
@kindex C-x C-k e
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 @@
+2012-10-23 Chong Yidong <cyd@gnu.org>
+
+ * keymaps.texi (Key Sequences): Avoid referring to Edit Macro mode
+ (Bug#12529).
+
2012-10-22 Glenn Morris <rgm@gnu.org>
* 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}.
@defmac kbd keyseq-text
This macro converts the text @var{keyseq-text} (a string constant)
into a key sequence (a string or vector constant). The contents of
-@var{keyseq-text} should describe the key sequence using almost the same
-syntax used in this manual. More precisely, it uses the same syntax
-that Edit Macro mode uses for editing keyboard macros (@pxref{Edit
-Keyboard Macro,,, emacs, The GNU Emacs Manual}); you must surround
-function key names with @samp{<@dots{}>}.
+@var{keyseq-text} should use the same syntax as in the buffer invoked
+by the @kbd{C-x C-k @key{RET}} (@code{kmacro-edit-macro}) command; in
+particular, you must surround function key names with
+@samp{<@dots{}>}. @xref{Edit Keyboard Macro,,, emacs, The GNU Emacs
+Manual}.
@example
(kbd "C-x") @result{} "\C-x"
--
2.39.5