Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Fri, 15 Feb 2019 21:25:31 +0000 (13:25 -0800)
committerGlenn Morris <rgm@gnu.org>
Fri, 15 Feb 2019 21:25:31 +0000 (13:25 -0800)
f721084 (origin/emacs-26) Avoid errors in erc-dcc.el when erc-dcc-ver...
3cba92d Fix faces in compilation messages

1  2 
lisp/erc/erc-dcc.el
lisp/progmodes/compile.el

Simple merge
Simple merge