diff options
| author | Gregory Anders <8965202+gpanders@users.noreply.github.com> | 2023-06-05 20:36:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-05 20:36:21 -0500 |
| commit | 43f3209b070a8515a26a37917b85d0e682d7a3c7 (patch) | |
| tree | 3cb514b87a0a09a79455579b40904cb21c4c9196 | |
| parent | 9deef1aa227717a2c73ab1d4ad2c883d9b3c2f24 (diff) | |
| download | rneovim-43f3209b070a8515a26a37917b85d0e682d7a3c7.tar.gz rneovim-43f3209b070a8515a26a37917b85d0e682d7a3c7.tar.bz2 rneovim-43f3209b070a8515a26a37917b85d0e682d7a3c7.zip | |
vim-patch:9.0.1613: some make output gets picked up by 'errorformat' (#23926)
Problem: Some make output gets picked up by 'errorformat'.
Solution: Ignore make output by default. (Gregory Anders, closes vim/vim#12481)
https://github.com/vim/vim/commit/d1911a8e2b1498f0cb0275a98f63dd212204a1a8
| -rw-r--r-- | src/nvim/option_defs.h | 2 | ||||
| -rw-r--r-- | test/old/testdir/test_quickfix.vim | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h index ed9acde2b1..bbf009213d 100644 --- a/src/nvim/option_defs.h +++ b/src/nvim/option_defs.h @@ -105,7 +105,7 @@ typedef enum { "%f(%l) \\=: %t%*\\D%n: %m,%*[^\"]\"%f\"%*\\D%l: %m,%f(%l) \\=: %m,%*[^ ] %f %l: %m,%f:%l:%c:%m,%f(%l):%m,%f:%l:%m,%f|%l| %m" #else # 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" + "%*[^\"]\"%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 #define DFLT_GREPFORMAT "%f:%l:%m,%f:%l%m,%f %l%m" diff --git a/test/old/testdir/test_quickfix.vim b/test/old/testdir/test_quickfix.vim index 156ce23d54..9e8e87fbde 100644 --- a/test/old/testdir/test_quickfix.vim +++ b/test/old/testdir/test_quickfix.vim @@ -1029,7 +1029,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 |