master 08c5cba2e46: Add calling convention to face-attr-construct

[Stefan Kangas]

branch: master
commit 08c5cba2e4637cfe79a0ebf1bf2a07a304c277b6
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    Add calling convention to face-attr-construct
    
    * lisp/faces.el (face-attr-construct): Add
    advertised-calling-convention declaration.
---
 lisp/cus-edit.el | 2 +-
 lisp/faces.el    | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index f5143bdb53f..9b73a72b238 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -3751,7 +3751,7 @@ WIDGET should be a `custom-face' widget."
     ;; If the user has changed this face in some other way,
     ;; edit it as the user has specified it.
     (if (not (face-spec-match-p face spec (selected-frame)))
-       (setq spec `((t ,(face-attr-construct face (selected-frame))))))
+        (setq spec `((t ,(face-attr-construct face)))))
     spec))
 
 (defun custom-face-get-current-spec (face)
diff --git a/lisp/faces.el b/lisp/faces.el
index 8017f5fa65e..1a446aacacd 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1540,15 +1540,12 @@ argument, prompt for a regular expression using 
`read-regexp'."
 ;;; Face specifications (defface).
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-;; Parameter FRAME Is kept for call compatibility to with previous
-;; face implementation.
-
 (defun face-attr-construct (face &optional _frame)
   "Return a `defface'-style attribute list for FACE.
 Value is a property list of pairs ATTRIBUTE VALUE for all specified
 face attributes of FACE where ATTRIBUTE is the attribute name and
-VALUE is the specified value of that attribute.
-Argument FRAME is ignored and retained for compatibility."
+VALUE is the specified value of that attribute."
+  (declare (advertised-calling-convention (face) "30.1"))
   (let (result)
     (dolist (entry face-attribute-name-alist result)
       (let* ((attribute (car entry))