Merge from origin/emacs-26

f721084 (origin/emacs-26) Avoid errors in erc-dcc.el when erc-dcc-ver...
3cba92d Fix faces in compilation messages

diff --cc lisp/erc/erc-dcc.el
Simple merge

diff --cc lisp/progmodes/compile.el
Simple merge