masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-03 19:03:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

; Fix last change (bug#77945)

Browse source 
* lisp/faces.el (face-all-attributes):
* etc/NEWS: Reformat and fix wording in documentation.
This commit is contained in:
Eli Zaretskii 2025-06-07 12:43:39 +03:00
parent 13fa74b73c
commit 0bc2a5a2c1
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
etc/NEWS
View file

@ -2058,8 +2058,8 @@ This option tells 'flash-face-bell-function' and
for flash. for flash.
+++ +++
*** 'face-all-attributes' now accepts an optional inherit argument. *** 'face-all-attributes' now accepts an optional argument INHERIT.
'inherit' has the same meaning as the same argument to 'face-attribute', It has the same meaning as the INHERIT argument to 'face-attribute',
which already takes this argument for a single attribute. This is which already takes this argument for a single attribute. This is
useful when you want the face attributes to be absolute and not useful when you want the face attributes to be absolute and not
'unspecified'. 'unspecified'.

10
lisp/faces.el
View file

@ -444,11 +444,11 @@ If `inhibit-x-resources' is non-nil, this function does nothing."
(defun face-all-attributes (face &optional frame inherit) (defun face-all-attributes (face &optional frame inherit)
"Return an alist stating the attributes of FACE. "Return an alist stating the attributes of FACE.
Each element of the result has the form (ATTR-NAME . ATTR-VALUE). If Each element of the result has the form (ATTR-NAME . ATTR-VALUE).
FRAME is omitted or nil the value describes the default attributes, but If FRAME is omitted or nil the value describes the default attributes,
if you specify FRAME, the value describes the attributes of FACE on but if you specify FRAME, the value describes the attributes of FACE
FRAME. INHERIT has the same meaning as the same argument to on FRAME.
`face-attribute', which see." INHERIT has the same meaning as in `face-attribute', which see."
(mapcar (lambda (pair) (mapcar (lambda (pair)
(let ((attr (car pair))) (let ((attr (car pair)))
(cons attr (face-attribute face attr (or frame t) inherit)))) (cons attr (face-attribute face attr (or frame t) inherit))))