5 commits

Author	SHA1	Message	Date
Paul Eggert	e6a782ee1a	Update copyright year to 2017 in master ... Run admin/update-copyright in the master branch. This fixes files that were not already fixed in the emacs-25 branch before it was merged here.	2017-01-01 01:48:59 -08:00
Tino Calancha	1d119be4d3	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).	2016-07-21 21:51:24 +09:00
Glenn Morris	aa112ebab7	; Comment tweak.	2016-04-29 13:31:45 -04:00
Paul Eggert	7621a52145	; Spelling fixes	2016-04-21 14:45:01 -07:00
Vivek Dasmohapatra	badf7369a6	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.	2016-04-07 14:23:18 +02:00