*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 141d8544faf4b6c70c58b072c3a29b45016f82a5..ad9e09305b7f3835aa399133bf6f6fbe1002ccaa 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2002-09-10  Kim F. Storm  <no-spam@cua.dk>
+
+       * macros.el (apply-macro-to-region-lines): Let-bind mark-active to
+       nil while executing macro to avoid triggering delete-selection-mode.
+
+       * simple.el (keyboard-quit): Set defining-kbd-macro to nil to
+       cancel defining keyboard macro when applicablex.
+
 2002-09-09  Markus Rost  <rost@math.ohio-state.edu>
 
        * files.el (save-some-buffers-action-alist):  Use lower case for

diff --git a/src/ChangeLog b/src/ChangeLog
index faf995354ca98758076c97fc13d5dcdf8bf54edf..4f418b00bc4d30480a3eb32d393c98e4d78bf9fa 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2002-09-10  Kim F. Storm  <no-spam@cua.dk>
+
+       * macros.c (end_kbd_macro): New function.
+       (Fend_kbd_macro): Use it.
+
+       * macros.h (end_kbd_macro): Declare extern.
+
+       * keyboard.c (Fdiscard_input): If defining keyboard macro,
+       end and save it instead of discarding it.
+
 2002-09-09  Markus Rost  <rost@math.ohio-state.edu>
 
        * s/sol2-6.h: Fix typo.  Add comment.