master 52ad5dc479e 2/2: Add calling convention to x-compose-font-name

[Stefan Kangas]

branch: master
commit 52ad5dc479eb70b553e84e487d044427c210a7e4
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    Add calling convention to x-compose-font-name
    
    * lisp/international/fontset.el (x-compose-font-name): Add
    advertised-calling-convention for argument ignored since 22.1.
---
 lisp/international/fontset.el | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 27d7f509752..d879920b1d0 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -1274,9 +1274,8 @@ Return nil if PATTERN doesn't conform to XLFD."
 (defun x-compose-font-name (fields &optional _reduce)
   "Compose X fontname from FIELDS.
 FIELDS is a vector of XLFD fields, of length 12.
-If a field is nil, wild-card letter `*' is embedded.
-Optional argument REDUCE exists just for backward compatibility,
-and is always ignored."
+If a field is nil, wild-card letter `*' is embedded."
+  (declare (advertised-calling-convention (fields) "30.1"))
   (concat "-" (mapconcat (lambda (x) (or x "*")) fields "-")))