*** empty log message ***

2 files changed, 18 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 141d8544faf..ad9e09305b7 100644
--- 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 faf995354ca..4f418b00bc4 100644
--- 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.