diff --git a/etc/NEWS b/etc/NEWS index 04b3386aacd..b054827a678 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -2058,8 +2058,8 @@ This option tells 'flash-face-bell-function' and for flash. +++ -*** 'face-all-attributes' now accepts an optional inherit argument. -'inherit' has the same meaning as the same argument to 'face-attribute', +*** 'face-all-attributes' now accepts an optional argument INHERIT. +It has the same meaning as the INHERIT argument to 'face-attribute', which already takes this argument for a single attribute. This is useful when you want the face attributes to be absolute and not 'unspecified'. diff --git a/lisp/faces.el b/lisp/faces.el index 3b48c243587..cf81013118b 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -444,11 +444,11 @@ If `inhibit-x-resources' is non-nil, this function does nothing." (defun face-all-attributes (face &optional frame inherit) "Return an alist stating the attributes of FACE. -Each element of the result has the form (ATTR-NAME . ATTR-VALUE). If -FRAME is omitted or nil the value describes the default attributes, but -if you specify FRAME, the value describes the attributes of FACE on -FRAME. INHERIT has the same meaning as the same argument to -`face-attribute', which see." +Each element of the result has the form (ATTR-NAME . ATTR-VALUE). +If FRAME is omitted or nil the value describes the default attributes, +but if you specify FRAME, the value describes the attributes of FACE +on FRAME. +INHERIT has the same meaning as in `face-attribute', which see." (mapcar (lambda (pair) (let ((attr (car pair))) (cons attr (face-attribute face attr (or frame t) inherit))))