summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim F. Storm <storm@cua.dk>2004-10-11 22:36:16 +0000
committerKim F. Storm <storm@cua.dk>2004-10-11 22:36:16 +0000
commitb583964c159599312e90e47d330dab9330a23dda (patch)
treea3c453eb505feb0bd6a75a659ddf1134a549d0ea
parent52996e8c2f6bce18dd48ac5a23a3c83666951ccc (diff)
downloademacs-b583964c159599312e90e47d330dab9330a23dda.tar.gz
emacs-b583964c159599312e90e47d330dab9330a23dda.tar.bz2
emacs-b583964c159599312e90e47d330dab9330a23dda.zip
*** empty log message ***
-rw-r--r--lisp/ChangeLog8
-rw-r--r--src/ChangeLog7
2 files changed, 13 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1a8e2ebcbe4..eb028c98a25 100644
--- 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 7ef3c5d9180..1a513d0194e 100644
--- 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,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>