diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-02-15 13:25:31 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-02-15 13:25:31 -0800 |
| commit | b15e6e456da915e7f398be63dfaaee64bdb6dc2d (patch) | |
| tree | e5ec42d20c68774e86461ffc2807d6d90eb35b09 /lisp/progmodes/compile.el | |
| parent | 613f9740e498c7c55cee6eba1a1407dd3d57b681 (diff) | |
| parent | f721084f788dbbbf114c47f87af7d5771b5fb769 (diff) | |
| download | emacs-b15e6e456da915e7f398be63dfaaee64bdb6dc2d.tar.gz | |
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
Diffstat (limited to 'lisp/progmodes/compile.el')
| -rw-r--r-- | lisp/progmodes/compile.el | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 9fbe3614fd1..c3ff57633a3 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -1401,17 +1401,17 @@ to `compilation-error-regexp-alist' if RULES is nil." file line end-line col end-col (or type 2) fmt)) (when (integerp file) - (setq type (if (consp type) - (compilation-type type) - (or type 2))) - (compilation--note-type type) - - (compilation--put-prop - file 'font-lock-face - (symbol-value (aref [compilation-info-face - compilation-warning-face - compilation-error-face] - type)))) + (let ((this-type (if (consp type) + (compilation-type type) + (or type 2)))) + (compilation--note-type type) + + (compilation--put-prop + file 'font-lock-face + (symbol-value (aref [compilation-info-face + compilation-warning-face + compilation-error-face] + this-type))))) (compilation--put-prop line 'font-lock-face compilation-line-face) |