From: Eshel Yaron <me@eshelyaron.com>
Date: Tue, 16 Jan 2024 11:38:42 +0000 (+0100)
Subject: ; Fix non-symbol DEFAULT argument handling in 'read-face-name'
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=861d0123092711b6bf6c168936f42cabc9ac649d;p=emacs.git

; Fix non-symbol DEFAULT argument handling in 'read-face-name'

This fixes an error in 'hi-lock-read-face-name' that was introduced in
6cd47f59326.

* lisp/faces.el (read-face-name): Fix DEFAULT normalization.
---

diff --git a/lisp/faces.el b/lisp/faces.el
index a67aa41acc1..d28839bd538 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1178,7 +1178,9 @@ this function returns only the first face name and ignores
 everything after the first separator, but if optional argument
 MULTIPLE is non-nil, this function returns all of the face names
 in your input as a list of face names."
-  (let* ((default (when default (symbol-name default)))
+  (let* ((default (mapcar
+                   (lambda (d) (if (and d (symbolp d)) (symbol-name d) d))
+                   (ensure-list default)))
          (faces
           (mapcar #'intern
                   (completing-read-multiple