From: Kevin Brubeck Unhammer <unhammer@fsfe.org>
Date: Thu, 4 Feb 2016 05:49:42 +0000 (+1100)
Subject: Make tracking faces in Emacs work more reliably
X-Git-Tag: emacs-25.0.91~94
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d93d2c5b16dc98671a35374ac20fa6f7108f1c7c;p=emacs.git

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 1750cb77845..4d8feb52759 100644
--- 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)))