aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTino Calancha2016-07-21 21:51:24 +0900
committerTino Calancha2016-07-21 21:51:24 +0900
commit1d119be4d35f2f02cd949a203e24ce5320559ff5 (patch)
tree9884edf7264a35f682a9877e4bb696409e08f859
parenta066fb1ceee373c982214c28206108c5fba01bf7 (diff)
downloademacs-1d119be4d35f2f02cd949a203e24ce5320559ff5.tar.gz
emacs-1d119be4d35f2f02cd949a203e24ce5320559ff5.zip
Fix failing test
* test/lisp/erc/erc-track-tests.el (erc-track--erc-faces-in): Enable Font Lock mode in order to initialize 'char-property-alias-alist' (Bug#23954).
-rw-r--r--test/lisp/erc/erc-track-tests.el10
1 files changed, 7 insertions, 3 deletions
diff --git a/test/lisp/erc/erc-track-tests.el b/test/lisp/erc/erc-track-tests.el
index 24dfcfbe6e0..7cf3ef7bb2f 100644
--- a/test/lisp/erc/erc-track-tests.el
+++ b/test/lisp/erc/erc-track-tests.el
@@ -24,6 +24,7 @@
24 24
25(require 'ert) 25(require 'ert)
26(require 'erc-track) 26(require 'erc-track)
27(require 'font-core)
27 28
28(ert-deftest erc-track--shorten-aggressive-nil () 29(ert-deftest erc-track--shorten-aggressive-nil ()
29 "Test non-aggressive erc track buffer name shortening." 30 "Test non-aggressive erc track buffer name shortening."
@@ -107,9 +108,12 @@
107(ert-deftest erc-track--erc-faces-in () 108(ert-deftest erc-track--erc-faces-in ()
108 "`erc-faces-in' should pick up both 'face and 'font-lock-face properties." 109 "`erc-faces-in' should pick up both 'face and 'font-lock-face properties."
109 (let ((str0 "is bold") 110 (let ((str0 "is bold")
110 (str1 "is bold") 111 (str1 "is bold"))
111 ;;(char-property-alias-alist '((face font-lock-face))) 112 ;; Turn on Font Lock mode: this initialize `char-property-alias-alist'
112 ) 113 ;; to '((face font-lock-face)). Note that `font-lock-mode' don't
114 ;; turn on the mode if the test is run on batch mode or if the
115 ;; buffer name starts with ?\s (Bug#23954).
116 (unless font-lock-mode (font-lock-default-function 1))
113 (put-text-property 3 (length str0) 'font-lock-face 117 (put-text-property 3 (length str0) 'font-lock-face
114 '(bold erc-current-nick-face) str0) 118 '(bold erc-current-nick-face) str0)
115 (put-text-property 3 (length str1) 'face 119 (put-text-property 3 (length str1) 'face