*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a2f29e028dd6fd74372db9de69b72f91ad15ac8f..5783263a9ecc2904ce20915cc3e32708417fb686 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-06  Gerd Moellmann  <gerd@gnu.org>
+
+       * term/x-win.el (x-handle-xrm-switch): Accept more than one -xrm
+       switch, like xterm, and concat resource strings, with a newline
+       between them.
+
 2001-03-06  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * international/codepage.el (cp770-decode-table) 

diff --git a/src/ChangeLog b/src/ChangeLog
index 9c18d735975640096e0ec4e1c7fc6bfc60d5bc59..9c468c35107eb8e9a495b8c936a759ec54d4b851 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-06  Gerd Moellmann  <gerd@gnu.org>
+
+       * xdisp.c (redisplay_internal): Set windows_or_buffers_changed
+       if face_change_count is non-zero.
+
 2001-03-06  Kenichi Handa  <handa@etl.go.jp>
 
        * ccl.c (ccl_driver) <CCL_ReadMultibyteChar2>: Fix for the case