diff options
| author | Glenn Morris <rgm@gnu.org> | 2021-10-16 09:18:37 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2021-10-16 09:18:37 -0700 |
| commit | 536968304bd2ab70819b2920fc015e4bf9330636 (patch) | |
| tree | 9a3936312a2e00c0b15888a59a4273425dc2ba18 /lisp/progmodes/compile.el | |
| parent | ffff168d5fb14fbfa74f7c04fab0235a14bb7e64 (diff) | |
| parent | e8488808dfe1460ce07042a1a523097ab90cf079 (diff) | |
| download | emacs-536968304bd2ab70819b2920fc015e4bf9330636.tar.gz emacs-536968304bd2ab70819b2920fc015e4bf9330636.tar.bz2 emacs-536968304bd2ab70819b2920fc015e4bf9330636.zip | |
Merge from origin/emacs-28
e8488808df Avoid aborts when a thread is signaled while "waiting for ...
21397cce51 Improve documentation string for 'compilation-error-regexp...
2971a6890f * lisp/emacs-lisp/comp.el (comp-trampoline-compile): Fix t...
e842d7f29a Fix removal of fringe indication of bookmarks
b5a0eda978 Prefer "graphical displays" to "X terminals" in documentation
4ad0fc0dd0 Precise documentation of file-notify-add-watch
f5b8df14c6 Fixes to account for windows' tab lines
ced72b6e4c * Fix `native-compile-target-directory' effectiveness on t...
502788bc3d Add missing single quotes in the Emacs manual
1af45ad04e ; * lisp/emacs-lisp/comp.el (comp-trampoline-compile): Fix...
12654b7423 * lisp/menu-bar.el (yank-menu-length): Fix docstring (bug#...
# Conflicts:
# lisp/gnus/gnus-undo.el
# lisp/menu-bar.el
Diffstat (limited to 'lisp/progmodes/compile.el')
| -rw-r--r-- | lisp/progmodes/compile.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 2b480e89507..14da5880203 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -662,7 +662,8 @@ has just been matched, and should correspondingly preserve this match data. TYPE is 2 or nil for a real error or 1 for warning or 0 for info. TYPE can also be of the form (WARNING . INFO). In that case this will be equivalent to 1 if the WARNING'th subexpression matched -or else equivalent to 0 if the INFO'th subexpression matched. +or else equivalent to 0 if the INFO'th subexpression matched, +or else equivalent to 2 if neither of them matched. See `compilation-error-face', `compilation-warning-face', `compilation-info-face' and `compilation-skip-threshold'. |