From: Kim F. Storm Date: Mon, 11 Oct 2004 22:36:16 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: ttn-vms-21-2-B4~4621 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b583964c159599312e90e47d330dab9330a23dda;p=emacs.git *** empty log message *** --- 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 +2004-10-12 Kim F. Storm + + * 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 + + * doc.c (Fsubstitute_command_keys): Ignore remappings unless there + are no ordinary bindings. + 2004-10-11 Jan Dj,Ad(Brv * 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