2 files changed, 8 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3b5a19197bc..69f537f916c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-11  Richard Stallman  <rms@gnu.org>
+
+        * subr.el (atomic-change-group): Prevent undo list truncation.
+
 2008-01-11  Martin Rudalics  <rudalics@gmx.at>
 
         * cus-start.el (all): Add missing version entries.
diff --git a/lisp/subr.el b/lisp/subr.el
index a9674bbba36..b4bd4a0150c 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1802,6 +1802,10 @@ user can undo the change normally."
   (let ((handle (make-symbol "--change-group-handle--"))
         (success (make-symbol "--change-group-success--")))
     `(let ((,handle (prepare-change-group))
+           ;; Don't truncate any undo data in the middle of this.
+           (undo-outer-limit nil)
+           (undo-limit most-positive-fixnum)
+           (undo-strong-limit most-positive-fixnum)
            (,success nil))
        (unwind-protect
            (progn