diff options
| -rw-r--r-- | src/quickfix.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_autocmd.vim | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 18 insertions, 0 deletions
diff --git a/src/quickfix.c b/src/quickfix.c index 742a1ee71..910c806f1 100644 --- a/src/quickfix.c +++ b/src/quickfix.c @@ -2603,6 +2603,8 @@ qflist_valid(win_T *wp, int_u qf_id) if (wp != NULL) { + if (!win_valid(wp)) + return FALSE; qi = GET_LOC_LIST(wp); // Location list if (qi == NULL) return FALSE; diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim index 15d237ee1..e07731d6e 100644 --- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -2783,4 +2783,18 @@ func Test_autocmd_closing_cmdwin() only endfunc +func Test_autocmd_vimgrep() + augroup aucmd_vimgrep + au QuickfixCmdPre,BufNew,BufDelete,BufReadCmd * sb + au QuickfixCmdPre,BufNew,BufDelete,BufReadCmd * q9 + augroup END + " TODO: if this is executed directly valgrind reports errors + call assert_fails('lv?a? ', 'E926:') + + augroup aucmd_vimgrep + au! + augroup END +endfunc + + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index 254aafdb8..12a5de856 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2474, +/**/ 2473, /**/ 2472, |