summaryrefslogtreecommitdiff
path: root/lisp/erc/erc-stamp.el
diff options
context:
space:
mode:
authorVivek Dasmohapatra <vivek@etla.org>2016-04-07 14:23:18 +0200
committerLars Magne Ingebrigtsen <larsi@gnus.org>2016-04-07 14:23:18 +0200
commitbadf7369a63e03a5f4f3817be10763611a6aa8a2 (patch)
tree0f7c996dd1863bb9aff9aecd5e620f009d8150dc /lisp/erc/erc-stamp.el
parent1f6b0bc1512de08fd542df0234476788038c8c82 (diff)
downloademacs-badf7369a63e03a5f4f3817be10763611a6aa8a2.tar.gz
emacs-badf7369a63e03a5f4f3817be10763611a6aa8a2.tar.bz2
emacs-badf7369a63e03a5f4f3817be10763611a6aa8a2.zip
Prefer 'font-lock-face to 'face in erc where appropriate
* lisp/erc/erc-button.el (erc-button-add-face): Prefer 'font-lock-face to 'face where appropriate. * lisp/erc/erc-capab.el (erc-capab-identify-add-prefix) * lisp/erc/erc-dcc.el (erc-dcc-chat-parse-output) * lisp/erc/erc-goodies.el (erc-controls-propertize) * lisp/erc/erc-stamp.el (erc-format-timestamp) * lisp/erc/erc-track.el (erc-faces-in) * lisp/erc/erc.el (erc-load-irc-script-lines, erc-display-msg) (erc-display-command, erc-make-notice, erc-highlight-notice) (erc-format-my-nick, erc-format-@nick, erc-format-privmessage) (erc-display-prompt, erc-display-message-highlight) (erc-log-irc-protocol): Ditto. * test/lisp/erc/erc-track-tests.el: Converted asserts into ert tests.
Diffstat (limited to 'lisp/erc/erc-stamp.el')
-rw-r--r--lisp/erc/erc-stamp.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el
index a4c91ca9fb5..ee4e1d2fb6d 100644
--- a/lisp/erc/erc-stamp.el
+++ b/lisp/erc/erc-stamp.el
@@ -347,7 +347,8 @@ changed, it will then print it off to the right."
Return the empty string if FORMAT is nil."
(if format
(let ((ts (format-time-string format time)))
- (erc-put-text-property 0 (length ts) 'face 'erc-timestamp-face ts)
+ (erc-put-text-property 0 (length ts)
+ 'font-lock-face 'erc-timestamp-face ts)
(erc-put-text-property 0 (length ts) 'invisible 'timestamp ts)
(erc-put-text-property 0 (length ts)
'isearch-open-invisible 'timestamp ts)