From d9573f9346e8af7be8d853503c0cbe10ec89d274 Mon Sep 17 00:00:00 2001 From: Nacho Barrientos Date: Sat, 3 Dec 2022 13:35:00 +0100 Subject: [PATCH] ERC: Track: Handle face text properties that are lists --- lisp/erc/erc-track.el | 2 +- test/lisp/erc/erc-track-tests.el | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el index ef9a8c243e9..4832926c4b2 100644 --- a/lisp/erc/erc-track.el +++ b/lisp/erc/erc-track.el @@ -847,7 +847,7 @@ erc-faces-in (and (setq cur (get-text-property i 'face str)) (not (member cur faces)) (push cur faces))) - faces)) + (flatten-list faces))) ;;; Buffer switching diff --git a/test/lisp/erc/erc-track-tests.el b/test/lisp/erc/erc-track-tests.el index 475a436bb1d..1e0409e9df2 100644 --- a/test/lisp/erc/erc-track-tests.el +++ b/test/lisp/erc/erc-track-tests.el @@ -116,8 +116,12 @@ erc-track--erc-faces-in (put-text-property 3 (length str0) 'font-lock-face '(bold erc-current-nick-face) str0) (put-text-property 3 (length str1) 'face - '(bold erc-current-nick-face) str1) + 'bold str1) (should (erc-faces-in str0)) - (should (erc-faces-in str1)) )) + (should (length= (erc-faces-in str0) 2)) + (should (equal (erc-faces-in str0) '(bold erc-current-nick-face))) + (should (erc-faces-in str1)) + (should (length= (erc-faces-in str1) 1)) + (should (equal (erc-faces-in str1) '(bold))) )) ;;; erc-track-tests.el ends here -- 2.38.1