2 files changed, 16 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index df5e3fd96bf..533d66a735a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-04  Gerd Moellmann  <gerd@gnu.org>
+
+        * format.el (format-decode): Don't change buffer's undo list.
+
 2000-12-04  Kenichi Handa  <handa@etl.go.jp>
 
         * faces.el (face-font-registry-alternatives): Add entries for CJK
diff --git a/src/ChangeLog b/src/ChangeLog
index 01d201b4d2a..16f14167313 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,9 +1,21 @@
 2000-12-04  Gerd Moellmann  <gerd@gnu.org>
 
+        * fileio.c (Finsert_file_contents): When VISIT is t, don't
+        record undo information for format-decode.
+
+        * undo.c (Fprimitive_undo): Bind inhibit-read-only to t if
+        current buffer is read-only, not if it isn't.
+
         * keyboard.c (record_char): Record `help-echo' input events
         in recent_keys only if they display some help.  Don't record
         `help-echo' events as macro char.
 
+2000-12-04  Richard M. Stallman  <rms@caffeine.ai.mit.edu>
+
+        * editfns.c (save_excursion_restore): Don't move point
+        in another window if it is showing the wrong buffer.
+        Avoid the call to Fwindow_live_p, for speed.
+
 2000-12-04  Kenichi Handa  <handa@etl.go.jp>
 
         * xfaces.c (struct font_name): New member registry_priority.