Mercurial > emacs
changeset 66975:68a08be78536
* faces.el (face-attribute, set-face-attribute): Mention existence
of `:ignore-defface' setting in docstring.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Fri, 18 Nov 2005 02:25:24 +0000 |
| parents | c52c20ff739f |
| children | 243cef8d7946 |
| files | lisp/ChangeLog lisp/faces.el |
| diffstat | 2 files changed, 16 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Nov 18 01:48:42 2005 +0000 +++ b/lisp/ChangeLog Fri Nov 18 02:25:24 2005 +0000 @@ -1,3 +1,8 @@ +2005-11-17 Chong Yidong <cyd@stupidchicken.com> + + * faces.el (face-attribute, set-face-attribute): Mention existence + of `:ignore-defface' setting in docstring. + 2005-11-17 Stefan Monnier <monnier@iro.umontreal.ca> * simple.el (completion-setup-function): Fix last change.
--- a/lisp/faces.el Fri Nov 18 01:48:42 2005 +0000 +++ b/lisp/faces.el Fri Nov 18 02:25:24 2005 +0000 @@ -357,11 +357,12 @@ If FRAME is t, report on the defaults for face FACE (for new frames). If FRAME is omitted or nil, use the selected frame. -If INHERIT is nil, only attributes directly defined by FACE are considered, - so the return value may be `unspecified', or a relative value. +If INHERIT is nil, only attributes directly defined by FACE are + considered, so the return value may be `unspecified', + `:ignore-defface', or a relative value. If INHERIT is non-nil, FACE's definition of ATTRIBUTE is merged with the faces specified by its `:inherit' attribute; however the return value - may still be `unspecified' or relative. + may still be relative. If INHERIT is a face or a list of faces, then the result is further merged with that face (or faces), until it becomes specified and absolute. @@ -560,8 +561,13 @@ attribute is changed on all frames). ARGS must come in pairs ATTRIBUTE VALUE. ATTRIBUTE must be a valid -face attribute name. All attributes can be set to `unspecified'; -this fact is not further mentioned below. +face attribute name. + +Unless you're certain you know what you're doing, don't set an +attribute to `unspecified' . To make a face ignore the attribute +given in the defface spec, assign it the value `:ignore-defface'. +You can do this for any attribute; this fact is not further +mentioned below. The following attributes are recognized: