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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6766a049f2176fe98f1ee7237659c1726f57ebbe..3f87d0841d642c341a403b73e03dc45481d9e74f 100644 (file)
--- 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 c8d58621fd13583ba8493e920be82e4410fde7b4..63a48e358911b7b3a6c1c70596ffcdace846fe15 100644 (file)
--- 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