# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 967269507 0
# Node ID cb5d69bcd655b57b58be40a96e7a0d956d69cb52
# Parent  af049ea731e5da0e74e77618994e713dafc23b77
Add description of new :inherit face attribute, and additional legal
values for the :height attribute.

diff -r af049ea731e5 -r cb5d69bcd655 etc/NEWS
--- a/etc/NEWS	Sat Aug 26 05:56:50 2000 +0000
+++ b/etc/NEWS	Sat Aug 26 05:58:27 2000 +0000
@@ -2587,8 +2587,10 @@
 
 `:height'
 
-VALUE must be an integer specifying the height of the font to use in
-1/10 pt.
+VALUE must be either an integer specifying the height of the font to use
+in 1/10 pt, a floating point number specifying the amount by which to
+scale any underlying face, or a function, which is called with the old
+height (from the underlying face), and should return the new height.
 
 `:weight'
 
@@ -2678,6 +2680,12 @@
 Please see also the documentation of `set-face-attribute' and
 `defface'.
 
+`:inherit'
+
+VALUE is the name of a face from which to inherit attributes, or a list
+of face names.  Attributes from inherited faces are merged into the face
+like an underlying face would be, with higher priority than underlying faces.
+
 *** Face attributes and X resources
 
 The following X resource names can be used to set face attributes