diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/custom.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e5af0e44f54..6e64e20391d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2001-10-17 Miles Bader <miles@gnu.org> | ||
| 2 | |||
| 3 | * custom.el (defface): Mention `:inherit' in doc-string. | ||
| 4 | |||
| 1 | 2001-10-16 Eli Zaretskii <eliz@is.elta.co.il> | 5 | 2001-10-16 Eli Zaretskii <eliz@is.elta.co.il> |
| 2 | 6 | ||
| 3 | * paren.el: Update the Commentary with installation instructions. | 7 | * 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: | |||
| 235 | 235 | ||
| 236 | The possible attributes are `:family', `:width', `:height', `:weight', | 236 | The possible attributes are `:family', `:width', `:height', `:weight', |
| 237 | `:slant', `:underline', `:overline', `:strike-through', `:box', | 237 | `:slant', `:underline', `:overline', `:strike-through', `:box', |
| 238 | `:foreground', `:background', `:stipple', and `:inverse-video'. | 238 | `:foreground', `:background', `:stipple', `:inverse-video', and `:inherit'. |
| 239 | 239 | ||
| 240 | DISPLAY can either be the symbol t, which will match all frames, or an | 240 | DISPLAY can either be the symbol t, which will match all frames, or an |
| 241 | alist of the form \((REQ ITEM...)...). For the DISPLAY to match a | 241 | alist of the form \((REQ ITEM...)...). For the DISPLAY to match a |