# HG changeset patch
# User Luc Teirlinck <teirllm@auburn.edu>
# Date 1101947956 0
# Node ID af6f7a42f2d345d70d8fd3f4391803334dc9e9ed
# Parent  939c9f3f6cd640c461c920d9c7ff5e26130b594d
*** empty log message ***

diff -r 939c9f3f6cd6 -r af6f7a42f2d3 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Dec 02 00:36:51 2004 +0000
+++ b/lisp/ChangeLog	Thu Dec 02 00:39:16 2004 +0000
@@ -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 -r 939c9f3f6cd6 -r af6f7a42f2d3 man/ChangeLog
--- a/man/ChangeLog	Thu Dec 02 00:36:51 2004 +0000
+++ b/man/ChangeLog	Thu Dec 02 00:39:16 2004 +0000
@@ -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