[Emacs-diffs] /srv/bzr/emacs/trunk r110624: * doc/lispref/keymaps.texi (Key Sequences): Avoid referring to Edit Macro mode.

[Chong Yidong]

------------------------------------------------------------
revno: 110624
fixes bug: http://debbugs.gnu.org/12529
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2012-10-23 10:23:39 +0800
message:
  * doc/lispref/keymaps.texi (Key Sequences): Avoid referring to Edit Macro 
mode.
  
  * doc/emacs/kmacro.texi (Edit Keyboard Macro): Fix typo.
modified:
  doc/emacs/ChangeLog
  doc/emacs/kmacro.texi
  doc/lispref/ChangeLog
  doc/lispref/keymaps.texi

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2012-10-18 03:27:17 +0000
+++ b/doc/emacs/ChangeLog       2012-10-23 02:23:39 +0000
@@ -1,3 +1,7 @@
+2012-10-23  Chong Yidong  <address@hidden>
+
+       * kmacro.texi (Edit Keyboard Macro): Fix typo.
+
 2012-10-18  Dani Moncayo  <address@hidden>
 
        * mini.texi (Completion Options): Fix off-by-one error.  (Bug#12644)

=== modified file 'doc/emacs/kmacro.texi'
--- a/doc/emacs/kmacro.texi     2012-05-27 01:25:06 +0000
+++ b/doc/emacs/kmacro.texi     2012-10-23 02:23:39 +0000
@@ -482,10 +482,11 @@
 @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
address@hidden 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}.
address@hidden 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
address@hidden C-c}.
 
 @findex edit-kbd-macro
 @kindex C-x C-k e

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-10-22 21:57:14 +0000
+++ b/doc/lispref/ChangeLog     2012-10-23 02:23:39 +0000
@@ -1,3 +1,8 @@
+2012-10-23  Chong Yidong  <address@hidden>
+
+       * keymaps.texi (Key Sequences): Avoid referring to Edit Macro mode
+       (Bug#12529).
+
 2012-10-22  Glenn Morris  <address@hidden>
 
        * os.texi (Recording Input): Tiny fix.

=== modified file 'doc/lispref/keymaps.texi'
--- a/doc/lispref/keymaps.texi  2012-09-23 10:46:50 +0000
+++ b/doc/lispref/keymaps.texi  2012-10-23 02:23:39 +0000
@@ -78,11 +78,11 @@
 @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
address@hidden 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{}>}.
address@hidden 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
address@hidden<@dots{}>}.  @xref{Edit Keyboard Macro,,, emacs, The GNU Emacs
+Manual}.
 
 @example
 (kbd "C-x") @result{} "\C-x"