(defface): Mention `:inherit' in doc-string.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e5af0e44f54fc03c5fd4f5540b7c4da6f0cc4f57..6e64e20391dccc453c0c8e0e619508114925e569 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-17  Miles Bader  <miles@gnu.org>
+
+       * custom.el (defface): Mention `:inherit' in doc-string.
+
 2001-10-16  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * paren.el: Update the Commentary with installation instructions.

diff --git a/lisp/custom.el b/lisp/custom.el
index 43c3184469da73e492da62a4e5d6a7b4290ff77d..f8dd28fc386983b4afa7417f4ee43fc6737ad721 100644 (file)
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -235,7 +235,7 @@ ATTS is a list of face attributes followed by their values:
 
 The possible attributes are `:family', `:width', `:height', `:weight',
 `:slant', `:underline', `:overline', `:strike-through', `:box',
-`:foreground', `:background', `:stipple', and `:inverse-video'.
+`:foreground', `:background', `:stipple', `:inverse-video', and `:inherit'.
 
 DISPLAY can either be the symbol t, which will match all frames, or an
 alist of the form \((REQ ITEM...)...).  For the DISPLAY to match a