mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-06-14 12:31:25 +00:00
Avoid compilation-mode matching rust as gnu
* lisp/progmodes/compile.el (compilation-error-regexp-alist-alist): Put 'rust' before 'gnu' to avoid a mismatch since the " |" has become optional (bug#81075). Copyright-paperwork-exempt: yes
This commit is contained in:
parent
4f13f52a3a
commit
1800350b18
1 changed files with 14 additions and 13 deletions
|
|
@ -421,6 +421,20 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
|
|||
nil
|
||||
(1 compilation-error-face))
|
||||
|
||||
;; This must precede the `gnu' rule or the latter would match instead.
|
||||
(rust
|
||||
,(rx bol (or (group-n 1 "error") (group-n 2 "warning") (group-n 3 "note"))
|
||||
(? "[" (+ (in "A-Z" "0-9")) "]") ":" (* nonl)
|
||||
"\n" (+ " ") "-->"
|
||||
" " (group-n 4 (+ nonl)) ; file
|
||||
":" (group-n 5 (+ (in "0-9"))) ; line
|
||||
":" (group-n 6 (+ (in "0-9")))) ; column
|
||||
4 5 6 (2 . 3)
|
||||
nil
|
||||
(1 compilation-error-face)
|
||||
(2 compilation-warning-face)
|
||||
(3 compilation-info-face))
|
||||
|
||||
;; Tested with Lua 5.1, 5.2, 5.3, 5.4, and LuaJIT 2.1.
|
||||
(lua
|
||||
,(rx bol
|
||||
|
|
@ -582,19 +596,6 @@ during global destruction\\.$\\)" 1 2)
|
|||
"\\(?:Parse\\|Fatal\\) error: \\(.*\\) in \\(.*\\) on line \\([0-9]+\\)"
|
||||
2 3 nil nil)
|
||||
|
||||
(rust
|
||||
,(rx bol (or (group-n 1 "error") (group-n 2 "warning") (group-n 3 "note"))
|
||||
(? "[" (+ (in "A-Z" "0-9")) "]") ":" (* nonl)
|
||||
"\n" (+ " ") "-->"
|
||||
" " (group-n 4 (+ nonl)) ; file
|
||||
":" (group-n 5 (+ (in "0-9"))) ; line
|
||||
":" (group-n 6 (+ (in "0-9")))) ; column
|
||||
4 5 6 (2 . 3)
|
||||
nil
|
||||
(1 compilation-error-face)
|
||||
(2 compilation-warning-face)
|
||||
(3 compilation-info-face))
|
||||
|
||||
(rxp
|
||||
"^\\(?:Error\\|Warnin\\(g\\)\\):.*\n.* line \\([0-9]+\\) char\
|
||||
\\([0-9]+\\) of file://\\(.+\\)"
|
||||
|
|
|
|||
Loading…
Reference in a new issue