2 files changed, 13 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b9d1f3a283a..6ef8d96e82e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-23  Gerd Moellmann  <gerd@gnu.org>
+
+        * progmodes/compile.el (compilation-forget-errors): Fix indentation.
+
 2000-12-22  Stefan Monnier  <monnier@cs.yale.edu>
 
         * smerge-mode.el (smerge-basic-map): Use `=' rather than `d'.
diff --git a/src/ChangeLog b/src/ChangeLog
index 149df461daa..6222f4df963 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2000-12-23  Gerd Moellmann  <gerd@gnu.org>
+
+        * xdisp.c (syms_of_xdisp): Doc fix.
+
+        * xdisp.c (redisplay_window): Remove label restore_buffers;
+        use finish_scroll_bars instead to make sure that scroll bars
+        are redeemed.  If we don't do this, flickering can result from
+        scroll bars being destroyed and recreated.
+
 2000-12-22  Jason Rumney  <jasonr@gnu.org>
 
         * w32term.c (w32_draw_bitmap): Fix drawing so it does not appear