* lisp/faces.el (faces--attribute-at-point): Use `face-list-p'

[gnu-emacs] / lisp / faces.el

diff --git a/lisp/faces.el b/lisp/faces.el
index d612461239e9b18e94da31638cfcea21f689c5ae..769f326efbe18a68023e7a71f6ab5204783f82bd 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1971,9 +1971,7 @@ unnamed faces (e.g, `foreground-color')."
                         (get-char-property (point) 'font-lock-face))
                    (get-char-property (point) 'face)))
         (found nil))
-    ;; The attribute might be a face, a list of faces, or a list of
-    ;; attributes that make a face.  Normalize it to a list of faces.
-    (dolist (face (if (and (listp faces) (facep (car faces)))
+    (dolist (face (if (face-list-p faces)
                       faces
                     (list faces)))
       (cond (found)