From d93d2c5b16dc98671a35374ac20fa6f7108f1c7c Mon Sep 17 00:00:00 2001 From: Kevin Brubeck Unhammer Date: Thu, 4 Feb 2016 16:49:42 +1100 Subject: [PATCH] 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 --- lisp/erc/erc-track.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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))) -- 2.39.2