2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 206063923b0..fb0c46c9a61 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-29  David Kastrup  <dak@gnu.org>
+
+        * international/mule.el (decode-coding-inserted-region): Don't
+        barf if `buffer-undo-list' is already set to `t'.
+
 2004-12-29  Jay Belanger  <belanger@truman.edu>
 
         * calc/calc-prog.el (calc-user-define-formula): Put default values
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index ea227ea7e9f..3a8560f29fb 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1893,7 +1893,7 @@ Part of the job of this function is setting `buffer-undo-list' appropriately."
           ;; Otherwise, if we can recognize the undo elt for the insertion,
           ;; remove it and get ready to replace it later.
           ;; In the mean time, turn off undo recording.
-          (let ((last (car buffer-undo-list))) 
+          (let ((last (car-safe buffer-undo-list))) 
             (if (and (consp last) (eql (car last) from) (eql (cdr last) to))
                 (setq undo-list-saved (cdr buffer-undo-list)
                       buffer-undo-list t))))