From eaa3e3caf0e93ba3a7369a710e4a10b0362b4f26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vivek=20Das=C2=A0Mohapatra?= Date: Sat, 26 Mar 2016 00:53:24 +0000 Subject: [PATCH] erc: fix a cl-assert in erc-track.el char-property-alias-alist is not yet set during the build, so we should check both the 'face property and it manually set alias 'font-lock-face in the cl-assert for erc-faces-in. --- lisp/erc/erc-track.el | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el index ef09376..a18f4ed 100644 --- a/lisp/erc/erc-track.el +++ b/lisp/erc/erc-track.el @@ -982,11 +982,15 @@ erc-faces-in faces)) (cl-assert - (let ((str "is bold")) - (put-text-property 3 (length str) - 'font-lock-face '(bold erc-current-nick-face) - str) - (erc-faces-in str))) + (let ((str0 "is bold") + (str1 "is bold") + (char-property-alias-alist '((face font-lock-face)))) + (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) + (and (erc-faces-in str0) + (erc-faces-in str1)))) ;;; Buffer switching -- 2.1.4