diff options
| author | Gregory Anders <greg@gpanders.com> | 2023-06-05 21:52:46 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2023-06-05 21:52:46 +0100 |
| commit | d1911a8e2b1498f0cb0275a98f63dd212204a1a8 (patch) | |
| tree | c47e1517008f9c7cc4ee9cc4afacf69ca82b5bd8 | |
| parent | 15d4747ffd197ffa5b5a41a852a1fe93b6cc35fd (diff) | |
patch 9.0.1613: some make output gets picked up by 'errorformat'v9.0.1613
Problem: Some make output gets picked up by 'errorformat'.
Solution: Ignore make output by default. (Gregory Anders, closes #12481)
| -rw-r--r-- | src/option.h | 2 | ||||
| -rw-r--r-- | src/testdir/test_quickfix.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/option.h b/src/option.h index 1dc9d51f84..3bd2eb9699 100644 --- a/src/option.h +++ b/src/option.h @@ -89,7 +89,7 @@ typedef enum { # ifdef VMS # define DFLT_EFM "%A%p^,%C%%CC-%t-%m,%Cat line number %l in file %f,%f|%l| %m" # else // Unix, probably -#define DFLT_EFM "%*[^\"]\"%f\"%*\\D%l: %m,\"%f\"%*\\D%l: %m,%-G%f:%l: (Each undeclared identifier is reported only once,%-G%f:%l: for each function it appears in.),%-GIn file included from %f:%l:%c:,%-GIn file included from %f:%l:%c\\,,%-GIn file included from %f:%l:%c,%-GIn file included from %f:%l,%-G%*[ ]from %f:%l:%c,%-G%*[ ]from %f:%l:,%-G%*[ ]from %f:%l\\,,%-G%*[ ]from %f:%l,%f:%l:%c:%m,%f(%l):%m,%f:%l:%m,\"%f\"\\, line %l%*\\D%c%*[^ ] %m,%D%*\\a[%*\\d]: Entering directory %*[`']%f',%X%*\\a[%*\\d]: Leaving directory %*[`']%f',%D%*\\a: Entering directory %*[`']%f',%X%*\\a: Leaving directory %*[`']%f',%DMaking %*\\a in %f,%f|%l| %m" +#define DFLT_EFM "%*[^\"]\"%f\"%*\\D%l: %m,\"%f\"%*\\D%l: %m,%-Gg%\\?make[%*\\d]: *** [%f:%l:%m,%-Gg%\\?make: *** [%f:%l:%m,%-G%f:%l: (Each undeclared identifier is reported only once,%-G%f:%l: for each function it appears in.),%-GIn file included from %f:%l:%c:,%-GIn file included from %f:%l:%c\\,,%-GIn file included from %f:%l:%c,%-GIn file included from %f:%l,%-G%*[ ]from %f:%l:%c,%-G%*[ ]from %f:%l:,%-G%*[ ]from %f:%l\\,,%-G%*[ ]from %f:%l,%f:%l:%c:%m,%f(%l):%m,%f:%l:%m,\"%f\"\\, line %l%*\\D%c%*[^ ] %m,%D%*\\a[%*\\d]: Entering directory %*[`']%f',%X%*\\a[%*\\d]: Leaving directory %*[`']%f',%D%*\\a: Entering directory %*[`']%f',%X%*\\a: Leaving directory %*[`']%f',%DMaking %*\\a in %f,%f|%l| %m" # endif # endif # endif diff --git a/src/testdir/test_quickfix.vim b/src/testdir/test_quickfix.vim index 79c169273d..7e4a048258 100644 --- a/src/testdir/test_quickfix.vim +++ b/src/testdir/test_quickfix.vim @@ -1200,7 +1200,7 @@ func Test_efm1() "Xtestfile", line 6 col 19; this is an error gcc -c -DHAVE_CONFIsing-prototypes -I/usr/X11R6/include version.c Xtestfile:9: parse error before `asd' - make: *** [vim] Error 1 + make: *** [src/vim/testdir/Makefile:100: test_quickfix] Error 1 in file "Xtestfile" linenr 10: there is an error 2 returned diff --git a/src/version.c b/src/version.c index a0c6893ee0..466209bcf8 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1613, +/**/ 1612, /**/ 1611, |