(face-x-resources): Add entry for :inherit.

2 files changed, 8 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6766a049f21..3f87d0841d6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.
diff --git a/lisp/faces.el b/lisp/faces.el
index c8d58621fd1..63a48e35891 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -267,7 +267,8 @@ If FRAME is omitted or nil, use the selected frame."
      (".attributeBackgroundPixmap" . "Face.AttributeBackgroundPixmap"))
     (:bold (".attributeBold" . "Face.AttributeBold"))
     (:italic (".attributeItalic" . "Face.AttributeItalic"))
-    (:font (".attributeFont" . "Face.AttributeFont")))
+    (:font (".attributeFont" . "Face.AttributeFont"))
+    (:inherit (".attributeInherit" . "Face.AttributeInherit")))
   "*List of X resources and classes for face attributes.
 Each element has the form (ATTRIBUTE ENTRY1 ENTRY2...) where ATTRIBUTE is
 the name of a face attribute, and each ENTRY is a cons of the form