# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 972920196 0
# Node ID 8e22433682513402f5717e55ca25d27779a28b83
# Parent  ca31e39656863c997c4bdccfc0c0902a4913a83f
*** empty log message ***

diff -r ca31e3965686 -r 8e2243368251 src/ChangeLog
--- a/src/ChangeLog	Mon Oct 30 15:36:11 2000 +0000
+++ b/src/ChangeLog	Mon Oct 30 15:36:36 2000 +0000
@@ -1,5 +1,8 @@
 2000-10-30  Gerd Moellmann  <gerd@gnu.org>
 
+	* xfaces.c (resolve_face_name): Handle case that FACE_NAME
+	is not a symbol or string.
+
 	* xdisp.c (echo_area_display): Don't perform a display update from
 	inside redisplay.  The update will happen anyway at the end of
 	redisplay, and it can confuse redisplay (GC messages while