man/kmacro.texi

[Luc Teirlinck]

I recommend the following changes to kmacro.texi:

===File ~/kmacro-diff=======================================
*** kmacro.texi 13 Aug 2004 16:24:17 -0500      1.4
--- kmacro.texi 16 Aug 2004 21:43:00 -0500      
***************
*** 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
***************
*** 220,225 ****
--- 220,229 ----
  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
  
***************
*** 264,271 ****
  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
--- 268,274 ----
  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 on each repetition of the macro.
  
  @findex kmacro-insert-counter
  @kindex C-x C-k C-i
***************
*** 362,378 ****
  @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
--- 365,384 ----
  @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 the last keyboard macro, then this will
! not affect the macro stored in the name.)  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 the last 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
***************
*** 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
============================================================