*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b9d1f3a283a043518f203802cfbe5fedd65c057d..6ef8d96e82ebe4bb0b47fb10cb5500da3b8a6b1a 100644 (file)
--- 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 149df461daa95c14d08cddb5e9fd68db5d421cfb..6222f4df963dc3c336f68f9567c52adbfe73dde7 100644 (file)
--- 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