From: Miles Bader <miles@gnu.org>
Date: Sat, 26 Aug 2000 05:51:52 +0000 (+0000)
Subject: (describe-face): Add support for :inherit attribute.
X-Git-Tag: emacs-pretest-21.0.90~1968
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=25ac7b52b010137bcabe0d168bc119db41772a0b;p=emacs.git

(describe-face): Add support for :inherit attribute.
---

diff --git a/lisp/faces.el b/lisp/faces.el
index 906ae16c780..cff3810219d 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1044,7 +1044,8 @@ If FRAME is omitted or nil, use the selected frame."
 		  (:box . "Box")
 		  (:inverse-video . "Inverse")
 		  (:stipple . "Stipple")
-		  (:font . "Font or fontset")))
+		  (:font . "Font or fontset")
+		  (:inherit . "Inherit")))
 	(max-width (apply #'max (mapcar #'(lambda (x) (length (cdr x)))
 					attrs))))
     (with-output-to-temp-buffer "*Help*"