# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 977586188 0
# Node ID 221af923240f1bb250bc28a3edfa963c1b7bd8c7
# Parent  98dd828601f2b18b0c796ff2747b0a90c9263c41
*** empty log message ***

diff -r 98dd828601f2 -r 221af923240f lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Dec 23 15:42:36 2000 +0000
+++ b/lisp/ChangeLog	Sat Dec 23 15:43:08 2000 +0000
@@ -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 -r 98dd828601f2 -r 221af923240f src/ChangeLog
--- a/src/ChangeLog	Sat Dec 23 15:42:36 2000 +0000
+++ b/src/ChangeLog	Sat Dec 23 15:43:08 2000 +0000
@@ -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