# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1097534176 0
# Node ID c73d8ac83f103d726eb9baede810b50e45bf0fb8
# Parent  e12200cc9b0025f2abcd40f3747049eb817ff47a
*** empty log message ***

diff -r e12200cc9b00 -r c73d8ac83f10 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Oct 11 22:13:20 2004 +0000
+++ b/lisp/ChangeLog	Mon Oct 11 22:36:16 2004 +0000
@@ -1,4 +1,10 @@
-2004-10-11  Kim F. Storm  <storm@cua.dk>
+2004-10-12  Kim F. Storm  <storm@cua.dk>
+
+	* kmacro.el (kmacro-insert-counter, kmacro-add-counter): Use and
+	reset kmacro-initial-counter-value if set.
+	(kmacro-set-counter): Only set kmacro-counter if defining or executing
+	macro.  Set kmacro-initial-counter-value otherwise. Never set both.
+	(kmacro-display): Show macro counter if non-zero.
 
 	* subr.el (substitute-key-definition): Mention command remapping
 	in doc string.
diff -r e12200cc9b00 -r c73d8ac83f10 src/ChangeLog
--- a/src/ChangeLog	Mon Oct 11 22:13:20 2004 +0000
+++ b/src/ChangeLog	Mon Oct 11 22:36:16 2004 +0000
@@ -1,3 +1,8 @@
+2004-10-12  Kim F. Storm  <storm@cua.dk>
+
+	* doc.c (Fsubstitute_command_keys): Ignore remappings unless there
+	are no ordinary bindings.
+
 2004-10-11  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* xfns.c (syms_of_xfns): defsubr x-file-dialog for GTK also.
@@ -15,7 +20,7 @@
 	* mac.c (mktime): Use emacs_mktime
 	(Fdo_applescript): Add BLOCK_INPUT around do_applescript
 	(Fmac_paste_function): Add better error handling for carbon
-	cut/paste 
+	cut/paste
 
 2004-10-10  Kim F. Storm  <storm@cua.dk>