# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 983887455 0
# Node ID adb23d572f63a4cae9e1cb54eb170f4f72dfb7dc
# Parent  30246e46027ef0f22a82ac139fcb7f14ab32f505
*** empty log message ***

diff -r 30246e46027e -r adb23d572f63 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Mar 06 14:02:02 2001 +0000
+++ b/lisp/ChangeLog	Tue Mar 06 14:04:15 2001 +0000
@@ -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 -r 30246e46027e -r adb23d572f63 src/ChangeLog
--- a/src/ChangeLog	Tue Mar 06 14:02:02 2001 +0000
+++ b/src/ChangeLog	Tue Mar 06 14:04:15 2001 +0000
@@ -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