Mercurial > emacs

changeset 31193:a15c5cb8ec71

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(face-x-resources): Add entry for :inherit.
author Miles Bader <miles@gnu.org>
date Sat, 26 Aug 2000 11:48:27 +0000
parents 4cea72ab1bae
children e80f2eafd21d
files lisp/faces.el
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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