; Fix last change (bug#77945)

* lisp/faces.el (face-all-attributes):
* etc/NEWS: Reformat and fix wording in documentation.

(cherry picked from commit 0bc2a5a2c178ac5e79ea577affe91e711b410123)

diff --git a/lisp/faces.el b/lisp/faces.el
index f3bdd89eb191865ed079209af642aa952aeb7646..893656acd55dd88c5b1445c63e431c1d0068b299 100644 (file)
--- 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))))