diff options
| author | Kevin Brubeck Unhammer <unhammer@fsfe.org> | 2016-02-04 16:49:42 +1100 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2016-02-04 16:49:42 +1100 |
| commit | d93d2c5b16dc98671a35374ac20fa6f7108f1c7c (patch) | |
| tree | 2cbd5ede1e9fc4217c5d5bfb5b16a0abc6730bca /lisp/erc/erc-track.el | |
| parent | af6ab7efc7a6ce83a289e05792498fa9354e6a32 (diff) | |
| download | emacs-d93d2c5b16dc98671a35374ac20fa6f7108f1c7c.tar.gz emacs-d93d2c5b16dc98671a35374ac20fa6f7108f1c7c.tar.bz2 emacs-d93d2c5b16dc98671a35374ac20fa6f7108f1c7c.zip | |
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
Diffstat (limited to 'lisp/erc/erc-track.el')
| -rw-r--r-- | lisp/erc/erc-track.el | 3 |
1 files changed, 2 insertions, 1 deletions
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))) |