# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 967290507 0
# Node ID a15c5cb8ec7133ba1791ea32ec11013c824f5eeb
# Parent  4cea72ab1bae25bdbd49ff3e602c794391f73fcd
(face-x-resources): Add entry for :inherit.

diff -r 4cea72ab1bae -r a15c5cb8ec71 lisp/faces.el
--- a/lisp/faces.el	Sat Aug 26 11:47:02 2000 +0000
+++ b/lisp/faces.el	Sat Aug 26 11:48:27 2000 +0000
@@ -267,7 +267,8 @@
      (".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