# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 967290606 0
# Node ID e80f2eafd21db45b5265109893279cf836367e4f
# Parent  a15c5cb8ec7133ba1791ea32ec11013c824f5eeb
*** empty log message ***

diff -r a15c5cb8ec71 -r e80f2eafd21d lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Aug 26 11:48:27 2000 +0000
+++ b/lisp/ChangeLog	Sat Aug 26 11:50:06 2000 +0000
@@ -1,5 +1,11 @@
 2000-08-26  Miles Bader  <miles@gnu.org>
 
+	* faces.el (face-x-resources): Add entry for :inherit.
+	* cus-face.el (custom-face-attributes): Add support for :inherit
+	attribute.  Add support for relative face heights.
+	(custom-face-attributes-get): Treat `nil' as being a default value
+	for :inherit (as well as `unspecified').
+
 	* faces.el (set-face-attribute): Update doc string.
 	(face-attribute-name-alist): Add :inherit.
 	(face-valid-attribute-values): Handle :inherit.