*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1a8e2ebcbe4875ee25dc17c83bed0a1bef851b09..eb028c98a25a2c28b044c90e0959c708c7c36afd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index 7ef3c5d91808e466be2be90b6cac197c93c315c7..1a513d0194ef8dc8077c3493822b4718b5a31414 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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\e,Ad\e(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>