# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 967473769 0
# Node ID 50b63dd65faf2e99419b5f05b325f2cfd7f55f2a
# Parent  5bd6bdf3d3cfca3dc60f14190fd28ae8d7601589
*** empty log message ***

diff -r 5bd6bdf3d3cf -r 50b63dd65faf src/ChangeLog
--- a/src/ChangeLog	Mon Aug 28 14:41:55 2000 +0000
+++ b/src/ChangeLog	Mon Aug 28 14:42:49 2000 +0000
@@ -1,3 +1,9 @@
+2000-08-28  Miles Bader  <miles@gnu.org>
+
+	* xfaces.c (merge_face_vectors): Clear TO's :font attribute if
+	made inconsistent by a font-related attribute in FROM.
+	(merge_face_inheritance): Add function comment.
+
 2000-08-28  Kenichi Handa  <handa@etl.go.jp>
 
 	* keyboard.c (read_char_minibuf_menu_prompt): Call read_char with