diff man/kmacro.texi @ 83548:c71725faff1a

Merged from [e-mail]. Last-minute emacsclient rewrites be damned! Patches applied: * [e-mail]/emacs--devo--0--patch-490 Update from CVS * [e-mail]/emacs--devo--0--patch-491 Update from CVS * [e-mail]/emacs--devo--0--patch-492 Update from CVS * [e-mail]/emacs--devo--0--patch-493 Update from CVS * [e-mail]/emacs--devo--0--patch-494 Update from CVS * [e-mail]/emacs--devo--0--patch-495 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-496 Update from CVS * [e-mail]/emacs--devo--0--patch-497 Update from CVS * [e-mail]/emacs--devo--0--patch-498 Update from CVS * [e-mail]/emacs--devo--0--patch-499 Update from CVS * [e-mail]/emacs--devo--0--patch-500 Update from CVS * [e-mail]/emacs--devo--0--patch-501 Update from CVS * [e-mail]/emacs--devo--0--patch-502 Update from CVS * [e-mail]/emacs--devo--0--patch-503 Update from CVS * [e-mail]/emacs--devo--0--patch-504 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-505 Update from CVS * [e-mail]/emacs--devo--0--patch-506 Update from CVS * [e-mail]/emacs--devo--0--patch-507 Update from CVS * [e-mail]/emacs--devo--0--patch-508 Update from CVS * [e-mail]/emacs--devo--0--patch-509 Update from CVS * [e-mail]/emacs--devo--0--patch-510 Update from CVS * [e-mail]/emacs--devo--0--patch-511 Update from CVS * [e-mail]/emacs--devo--0--patch-512 Update from CVS * [e-mail]/emacs--devo--0--patch-513 Update from CVS * [e-mail]/emacs--devo--0--patch-514 Update from CVS * [e-mail]/emacs--devo--0--patch-515 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-516 Update from CVS * [e-mail]/emacs--devo--0--patch-517 Update from CVS * [e-mail]/emacs--devo--0--patch-518 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-519 Update from CVS: etc/TUTORIAL.cn: Updated. * [e-mail]/emacs--devo--0--patch-520 Merge from erc--emacs--22 * [e-mail]/emacs--devo--0--patch-521 Update from CVS * [e-mail]/emacs--devo--0--patch-522 Update from CVS * [e-mail]/emacs--devo--0--patch-523 Update from CVS * [e-mail]/emacs--devo--0--patch-524 Update from CVS * [e-mail]/emacs--devo--0--patch-525 Update from CVS * [e-mail]/emacs--devo--0--patch-526 Update from CVS * [e-mail]/emacs--devo--0--patch-527 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-528 Update from CVS * [e-mail]/emacs--devo--0--patch-529 Update from CVS * [e-mail]/emacs--devo--0--patch-530 Update from CVS * [e-mail]/emacs--devo--0--patch-531 Update from CVS * [e-mail]/emacs--devo--0--patch-532 Update from CVS * [e-mail]/emacs--devo--0--patch-533 Update from CVS * [e-mail]/emacs--devo--0--patch-534 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-535 Update from CVS * [e-mail]/gnus--rel--5.10--patch-161 Update from CVS * [e-mail]/gnus--rel--5.10--patch-162 Update from CVS * [e-mail]/gnus--rel--5.10--patch-163 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-164 Update from CVS * [e-mail]/gnus--rel--5.10--patch-165 Update from CVS * [e-mail]/gnus--rel--5.10--patch-166 Update from CVS * [e-mail]/gnus--rel--5.10--patch-167 Update from CVS * [e-mail]/gnus--rel--5.10--patch-168 Update from CVS * [e-mail]/gnus--rel--5.10--patch-169 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-170 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-588

--- a/man/kmacro.texi	Sun Dec 03 12:36:08 2006 +0000
+++ b/man/kmacro.texi	Sun Dec 03 15:03:30 2006 +0000
@@ -46,19 +46,19 @@
 @section Basic Use
 
 @table @kbd
-@item C-x (
-@itemx @key{F3}
+@item @key{F3}
+@itemx C-x (
 Start defining a keyboard macro (@code{kmacro-start-macro}).
+@item @key{F4}
+If a keyboard macro is being defined, end the definition; otherwise,
+execute the most recent keyboard macro
+(@code{kmacro-end-or-call-macro}).
 @item C-x )
 End the definition of a keyboard macro (@code{kmacro-end-macro}).
 @item C-x e
 Execute the most recent keyboard macro (@code{kmacro-end-and-call-macro}).
 First end the definition of the keyboard macro, if currently defining it.
 To immediately execute the keyboard macro again, just repeat the @kbd{e}.
-@item @key{F4}
-If a keyboard macro is being defined, end the definition; otherwise,
-execute the most recent keyboard macro
-(@code{kmacro-end-or-call-macro}).
 @item C-u C-x (
 Re-execute last keyboard macro, then add more keys to its definition.
 @item C-u C-u C-x (
@@ -68,17 +68,19 @@
 (@code{apply-macro-to-region-lines}).
 @end table
 
+@kindex F3
+@kindex F4
 @kindex C-x (
 @kindex C-x )
 @kindex C-x e
 @findex kmacro-start-macro
 @findex kmacro-end-macro
 @findex kmacro-end-and-call-macro
-  To start defining a keyboard macro, type the @kbd{C-x (} command
+  To start defining a keyboard macro, type the @kbd{F3} or @kbd{C-x (} command
 (@code{kmacro-start-macro}).  From then on, your keys continue to be
 executed, but also become part of the definition of the macro.  @samp{Def}
 appears in the mode line to remind you of what is going on.  When you are
-finished, the @kbd{C-x )} command (@code{kmacro-end-macro}) terminates the
+finished, the @kbd{F4} or @kbd{C-x )} command (@code{kmacro-end-macro}) terminates the
 definition (without becoming part of it!).  For example,
 
 @example
@@ -115,7 +117,14 @@
 
   The key @key{F4} is like a combination of @kbd{C-x )} and @kbd{C-x
 e}.  If you're defining a macro, @key{F4} ends the definition.
-Otherwise it executes the last macro.
+Otherwise it executes the last macro.  For example,
+
+@example
+F3 xyz F4 F4 F4
+@end example
+
+@noindent
+inserts @samp{xyzxyzxyz} in the current buffer.
 
   If you wish to repeat an operation at regularly spaced places in the
 text, define a macro and include as part of the macro the commands to move
@@ -152,7 +161,8 @@
 macro as part of the process.
 
   After you have terminated the definition of a keyboard macro, you can add
-to the end of its definition by typing @kbd{C-u C-x (}.  This is equivalent
+to the end of its definition by typing @kbd{C-u F3} or @kbd{C-u C-x (}.
+This is equivalent
 to plain @kbd{C-x (} followed by retyping the whole definition so far.  As
 a consequence it re-executes the macro as previously defined.