# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 970538127 0
# Node ID 15b8a53f1d7ad9a6ff6f927a42fc298e9e851ea1
# Parent  cd19a69a37591f22800d70fc9a39ac0bb4b0b002
(Face Attributes): Add description of new :inherit face attribute, and
  additional legal values for the :height attribute.

diff -r cd19a69a3759 -r 15b8a53f1d7a lispref/display.texi
--- a/lispref/display.texi	Mon Oct 02 22:15:27 2000 +0000
+++ b/lispref/display.texi	Tue Oct 03 01:55:27 2000 +0000
@@ -1405,7 +1405,10 @@
 @code{extra-expanded}, or @code{ultra-expanded}.
    
 @item :height
-Font height, an integer in units of 1/10 point.
+Either the font height, an integer in units of 1/10 point, a floating
+point number specifying the amount by which to scale the height of any
+underlying face, or a function, which is called with the old height
+(from the underlying face), and should return the new height.
    
 @item :weight
 Font weight---a symbol from this series (from most dense to most faint):
@@ -1467,6 +1470,11 @@
 Whether or not characters should be strike-through, and in what
 color.  The value is used like that of @code{:underline}.
 
+@item :inherit
+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.
+
 @item :box
 Whether or not a box should be drawn around characters, its color, the
 width of the box lines, and 3D appearance.