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

diff --git a/lisp/faces.el b/lisp/faces.el
index 906ae16c780759e6cc063e15584522d2c7d12169..cff3810219db5cce8dd51777b88d7e364eaa71ed 100644 (file)
--- 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*"