# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 967375805 0
# Node ID 4c14695715f0b30e940d1a6d9c136ec60161e087
# Parent  1733db535955bea074971dc87ca0bdc2c794d4cd
*** empty log message ***

diff -r 1733db535955 -r 4c14695715f0 src/ChangeLog
--- a/src/ChangeLog	Sun Aug 27 11:28:37 2000 +0000
+++ b/src/ChangeLog	Sun Aug 27 11:30:05 2000 +0000
@@ -1,3 +1,8 @@
+2000-08-27  Gerd Moellmann  <gerd@gnu.org>
+
+	* xfaces.c (lface_fully_specified_p): Handle :inherit.
+	(Finternal_set_lisp_face_attribute): Fix typo in error message.
+
 2000-08-27  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* Makefile.in (dispnew.o, indent.o, fontset.o, minibuf.o)