Make tracking faces in Emacs work more reliably

* lisp/erc/erc-track.el (erc-faces-in): Always return lists of
faces to avoid later ambiguity (bug#22424).

Copyright-paperwork-exempt: Yes

diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index 1750cb7784530e7b3fc746c2ba7ebc817c7f4e7b..4d8feb52759e13b43d007ac7b700141a5d49c174 100644 (file)
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -971,7 +971,8 @@ is in `erc-mode'."
   "Return a list of all faces used in STR."
   (let ((i 0)
        (m (length str))
-       (faces (erc-list (get-text-property 0 'face str)))
+       (faces (let ((face1 (get-text-property 0 'face str)))
+                (when face1 (list face1))))
        cur)
     (while (and (setq i (next-single-property-change i 'face str m))
                (not (= i m)))