2 files changed, 18 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fc558de5e6e..94c3e757211 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2004-12-01  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * kmacro.el (kmacro-default-counter-format): New var.
+        (kmacro-set-format): Use it.  Delete `(printf format)' from prompt.
+        (kmacro-display): Remove `nil' from `and' form.  Delete call to
+        `format' inside `message'.
+        (kmacro-start-macro): Use `kmacro-default-counter-format'.
+
 2004-12-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * pcvs.el (cvs-header-msg): New function.
diff --git a/man/ChangeLog b/man/ChangeLog
index c8a9edc8f27..3ed65d6ab71 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,13 @@
+2004-12-01  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * kmacro.texi: Several small changes in addition to the following.
+        (Keyboard Macro Ring): Describe behavior of `C-x C-k C-k' when
+        defining a keyboard macro.
+        Mention `kmacro-ring-max'.
+        (Keyboard Macro Counter): Clarify description of
+        `kmacro-insert-counter', `kmacro-set-counter',
+        `kmacro-add-counter' and `kmacro-set-format'.
+
 2004-11-29  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * custom.texi (File Variables): Add `unibyte' and make it more