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

[Miles Bader]

Index: emacs/man/kmacro.texi
diff -c emacs/man/kmacro.texi:1.3.4.1 emacs/man/kmacro.texi:1.3.4.2
*** emacs/man/kmacro.texi:1.3.4.1       Fri Apr 16 12:50:41 2004
--- emacs/man/kmacro.texi       Fri Aug 27 07:00:30 2004
***************
*** 1,5 ****
  @c This is part of the Emacs manual.
! @c Copyright (C) 1985,86,87,93,94,95,97,2000,2001,2002,2003
  @c  Free Software Foundation, Inc.
  @c See file emacs.texi for copying conditions.
  @node Keyboard Macros, Files, Fixit, Top
--- 1,5 ----
  @c This is part of the Emacs manual.
! @c Copyright (C) 1985,86,87,93,94,95,97,2000,2001,2002,2003,2004
  @c  Free Software Foundation, Inc.
  @c See file emacs.texi for copying conditions.
  @node Keyboard Macros, Files, Fixit, Top
***************
*** 165,171 ****
  a consequence it re-executes the macro as previously defined.
  
    You can also add to the end of the definition of the last keyboard
! macro without re-execuing it by typing @kbd{C-u C-u C-x (}.
  
    The variable @code{kmacro-execute-before-append} specifies whether
  a single @kbd{C-u} prefix causes the existing macro to be re-executed
--- 165,171 ----
  a consequence it re-executes the macro as previously defined.
  
    You can also add to the end of the definition of the last keyboard
! macro without re-executing it by typing @kbd{C-u C-u C-x (}.
  
    The variable @code{kmacro-execute-before-append} specifies whether
  a single @kbd{C-u} prefix causes the existing macro to be re-executed
***************
*** 179,185 ****
  beginning of the line and then executing the macro.
  
  @node Keyboard Macro Ring
! @section Where previous keyboard macros are saved
  
    All defined keyboard macros are recorded in the ``keyboard macro ring'',
  a list of sequences of keys.  There is only one keyboard macro ring,
--- 179,185 ----
  beginning of the line and then executing the macro.
  
  @node Keyboard Macro Ring
! @section The Keyboard Macro Ring
  
    All defined keyboard macros are recorded in the ``keyboard macro ring'',
  a list of sequences of keys.  There is only one keyboard macro ring,
***************
*** 218,224 ****
  in the echo area.  You can continue to rotate the macro ring
  immediately by repeating just @kbd{C-n} and @kbd{C-p} until the
  desired macro is at the head of the ring.  To execute the new macro
! ring head immediately, just type @kbd{C-k}.  
  
  @findex kmacro-view-macro-repeat
  @kindex C-x C-k C-v
--- 218,228 ----
  in the echo area.  You can continue to rotate the macro ring
  immediately by repeating just @kbd{C-n} and @kbd{C-p} until the
  desired macro is at the head of the ring.  To execute the new macro
! ring head immediately, just type @kbd{C-k}.
! 
!   Note that Emacs treats the head of the macro ring as the ``last
! defined keyboard macro''.  For instance, it is the keyboard macro that
! @kbd{C-x e} will execute.
  
  @findex kmacro-view-macro-repeat
  @kindex C-x C-k C-v
***************
*** 257,271 ****
  executes the previous (rather than the head) element on the macro ring.
  
  @node Keyboard Macro Counter
! @section Inserting incrementing numbers in macros
  
    Each keyboard macro has an associated counter which is automatically
  incremented on every repetition of the keyboard macro.  Normally, the
  macro counter is initialized to 0 when you start defining the macro,
  and incremented by 1 after each insertion of the counter value;
  that is, if you insert the macro counter twice while defining the
! macro, it will be incremented by 2 time for each repetition of the
! macro.
  
  @findex kmacro-insert-counter
  @kindex C-x C-k C-i
--- 261,274 ----
  executes the previous (rather than the head) element on the macro ring.
  
  @node Keyboard Macro Counter
! @section The Keyboard Macro Counter
  
    Each keyboard macro has an associated counter which is automatically
  incremented on every repetition of the keyboard macro.  Normally, the
  macro counter is initialized to 0 when you start defining the macro,
  and incremented by 1 after each insertion of the counter value;
  that is, if you insert the macro counter twice while defining the
! macro, the counter will increase by 2 on each repetition of the macro.
  
  @findex kmacro-insert-counter
  @kindex C-x C-k C-i
***************
*** 361,383 ****
  @findex name-last-kbd-macro
  @kindex C-x C-k n
    If you wish to save a keyboard macro for later use, you can give it
! a name using @kbd{C-x C-k n} (@code{name-last-kbd-macro}). 
! This reads a name as an argument using the minibuffer and defines that name
! to execute the macro.  The macro name is a Lisp symbol, and defining it in
! this way makes it a valid command name for calling with @kbd{M-x} or for
! binding a key to with @code{global-set-key} (@pxref{Keymaps}).  If you
! specify a name that has a prior definition other than another keyboard
! macro, an error message is shown and nothing is changed.
  
  @cindex binding keyboard macros
  @findex kmacro-bind-to-key
  @kindex C-x C-k b
!   Rather than giving a keyboard macro a name, you can bind it to a
! key using @kbd{C-x C-k b} (@code{kmacro-bind-to-key}) followed by the
  key sequence you want the keyboard macro to be bound to.  You can
  bind to any key sequence in the global keymap, but since most key
  sequences already have other bindings, you should select the key
! sequence carefylly.  If you try to bind to a key sequence with an
  existing binding (in any keymap), you will be asked if you really
  want to replace the existing binding of that key.
  
--- 364,389 ----
  @findex name-last-kbd-macro
  @kindex C-x C-k n
    If you wish to save a keyboard macro for later use, you can give it
! a name using @kbd{C-x C-k n} (@code{name-last-kbd-macro}).
! This reads a name as an argument using the minibuffer and defines that
! name to execute the last keyboard macro, in its current form.  (If you
! later add to the definition of this macro, that does not alter the
! name's definition as a macro.)  The macro name is a Lisp symbol, and
! defining it in this way makes it a valid command name for calling with
! @kbd{M-x} or for binding a key to with @code{global-set-key}
! (@pxref{Keymaps}).  If you specify a name that has a prior definition
! other than a keyboard macro, an error message is shown and nothing is
! changed.
  
  @cindex binding keyboard macros
  @findex kmacro-bind-to-key
  @kindex C-x C-k b
!   You can also bind the last keyboard macro to a key, using
! @kbd{C-x C-k b} (@code{kmacro-bind-to-key}) followed by the
  key sequence you want the keyboard macro to be bound to.  You can
  bind to any key sequence in the global keymap, but since most key
  sequences already have other bindings, you should select the key
! sequence carefully.  If you try to bind to a key sequence with an
  existing binding (in any keymap), you will be asked if you really
  want to replace the existing binding of that key.
  
***************
*** 414,425 ****
  macro will be defined each time you run Emacs.
  
    If you give @code{insert-kbd-macro} a numeric argument, it makes
! additional Lisp code to record the keys (if any) that you have bound to the
! keyboard macro, so that the macro will be reassigned the same keys when you
! load the file.
  
  @node Edit Keyboard Macro
! @section Interactively executing and editing a keyboard macro
  
  @findex kmacro-edit-macro
  @kindex C-x C-k C-e
--- 420,431 ----
  macro will be defined each time you run Emacs.
  
    If you give @code{insert-kbd-macro} a numeric argument, it makes
! additional Lisp code to record the keys (if any) that you have bound
! to @var{macroname}, so that the macro will be reassigned the same keys
! when you load the file.
  
  @node Edit Keyboard Macro
! @section Editing a Keyboard Macro
  
  @findex kmacro-edit-macro
  @kindex C-x C-k C-e
***************
*** 443,454 ****
  @kbd{C-x C-k l} (@code{kmacro-edit-lossage}).
  
  @node Keyboard Macro Step-Edit
! @section Interactively executing and editing a keyboard macro
  
  @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.
--- 449,460 ----
  @kbd{C-x C-k l} (@code{kmacro-edit-lossage}).
  
  @node Keyboard Macro Step-Edit
! @section Stepwise Editing a Keyboard Macro
  
  @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.