[Emacs-diffs] Changes to emacs/man/kmacro.texi

[Richard M . Stallman]

Index: emacs/man/kmacro.texi
diff -c emacs/man/kmacro.texi:1.9 emacs/man/kmacro.texi:1.10
*** emacs/man/kmacro.texi:1.9   Thu Dec  2 00:36:51 2004
--- emacs/man/kmacro.texi       Wed Feb 16 10:07:28 2005
***************
*** 46,51 ****
--- 46,52 ----
  
  @table @kbd
  @item C-x (
+ @itemx @key{F3}
  Start defining a keyboard macro (@code{kmacro-start-macro}).
  @item C-x )
  End the definition of a keyboard macro (@code{kmacro-end-macro}).
***************
*** 53,58 ****
--- 54,63 ----
  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 (
***************
*** 120,125 ****
--- 125,134 ----
  indefinitely (until it gets an error or you type @kbd{C-g} or, on
  MS-DOS, @address@hidden).
  
+   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.
+ 
    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
  to the next place you want to use it.  For example, if you want to change
***************
*** 490,507 ****
  
  @findex kmacro-step-edit-macro
  @kindex C-x C-k SPC
!   You can interactively and stepwise replay and edit the last keyboard
! macro one command at a time by typing @kbd{C-x C-k SPC}
  (@code{kmacro-step-edit-macro}).  Unless you quit the macro using
  @kbd{q} or @kbd{C-g}, the edited macro replaces the last macro on the
  macro ring.
  
! This shows the last macro in the minibuffer together with the first
! (or next) command to be executed, and prompts you for an action.
! You can enter @kbd{?} to get a command summary.
! 
! The following commands are available in the step-edit mode and relate
! to the first (or current) command in the keyboard macro:
  
  @itemize @bullet{}
  @item
--- 499,514 ----
  
  @findex kmacro-step-edit-macro
  @kindex C-x C-k SPC
!   You can interactively replay and edit the last keyboard
! macro, one command at a time, by typing @kbd{C-x C-k SPC}
  (@code{kmacro-step-edit-macro}).  Unless you quit the macro using
  @kbd{q} or @kbd{C-g}, the edited macro replaces the last macro on the
  macro ring.
  
!   This macro editing feature shows the last macro in the minibuffer
! together with the first (or next) command to be executed, and prompts
! you for an action.  You can enter @kbd{?} to get a summary of your
! options.  These actions are available:
  
  @itemize @bullet{}
  @item