diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e5af0e44f54..6e64e20391d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2001-10-17 Miles Bader + + * custom.el (defface): Mention `:inherit' in doc-string. + 2001-10-16 Eli Zaretskii * paren.el: Update the Commentary with installation instructions. diff --git a/lisp/custom.el b/lisp/custom.el index 43c3184469d..f8dd28fc386 100644 --- 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