diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-09-05 10:20:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-05 10:20:46 -0700 |
| commit | 81eb0d36442ccd1dd577484cef8c3fbea2e6365e (patch) | |
| tree | 522b4b7bd224a935af04d8f651c8450c2b82a787 /src | |
| parent | 607d610d06d6a8aedf7642bd43abf69feb534f17 (diff) | |
| download | rneovim-81eb0d36442ccd1dd577484cef8c3fbea2e6365e.tar.gz rneovim-81eb0d36442ccd1dd577484cef8c3fbea2e6365e.tar.bz2 rneovim-81eb0d36442ccd1dd577484cef8c3fbea2e6365e.zip | |
vim-patch:8.1.0561: MSCV error format has changed #10952
This was marked as NA, but maybe we want the Windows-specific
default 'errorformat'?
https://github.com/vim/vim/commit/97195685334c800c5ad1328d957d1bf21f5fa1fa
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/option_defs.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h index f9cddf5550..0f86b17176 100644 --- a/src/nvim/option_defs.h +++ b/src/nvim/option_defs.h @@ -21,13 +21,14 @@ #define SREQ_WIN 1 // Request window-local option value #define SREQ_BUF 2 // Request buffer-local option value -/* - * Default values for 'errorformat'. - * The "%f|%l| %m" one is used for when the contents of the quickfix window is - * written to a file. - */ -#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" +// Default values for 'errorformat'. +// The "%f|%l| %m" one is used for when the contents of the quickfix window is +// written to a file. +#ifdef WIN32 +# define DFLT_EFM "%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" +#endif #define DFLT_GREPFORMAT "%f:%l:%m,%f:%l%m,%f %l%m" |