*** empty log message ***

2 files changed, 16 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bc4e75be761..8bd1b75edf3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2004-07-16  Kim F. Storm  <storm@cua.dk>
+
+        * simple.el (inhibit-mark-movement): New defvar.
+        (beginning-of-buffer, end-of-buffer): Do not push mark if
+        inhibit-mark-movement is non-nil or C-u prefix is given.
+
+        * emulation/cua-base.el (cua--preserve-mark-commands): New defvar.
+        Init to beginning-of-buffer and end-of-buffer.
+        (cua--undo-push-mark): New defvar.
+        (cua--pre-command-handler): Set inhibit-mark-movement if mark is
+        already active and command is in cua--preserve-mark-commands.
+        Also fix check for shift modifier on non-window systems.
+        (cua--post-command-handler): Clear inhibit-mark-movement if set.
+
 2004-07-14  Luc Teirlinck  <teirllm@auburn.edu>
 
         * calendar/cal-dst.el (calendar-time-from-absolute): Return a list
diff --git a/src/ChangeLog b/src/ChangeLog
index 7c720d73653..1dfaa3f9ce4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -5,8 +5,8 @@
 
 2004-07-15  David Kastrup  <dak@gnu.org>
 
-        * search.c (syms_of_search): staticpro
-        `saved_last_thing_searched'.  Apparently fixes an abort condition.
+        * search.c (syms_of_search): Staticpro `saved_last_thing_searched'.
+        Apparently fixes an abort condition.
 
 2004-07-14  Luc Teirlinck  <teirllm@auburn.edu>