diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-02-06 18:08:45 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-02-06 18:08:45 +0100 |
| commit | 8c6951fa2836a1ae3257770e7b927a9380439912 (patch) | |
| tree | e05bd10a6c9b28a523904e7d08aa7acfe8c12753 | |
| parent | aad5f9d79a2b71e9d2581eace3652be156102b9d (diff) | |
| download | vim-git-8c6951fa2836a1ae3257770e7b927a9380439912.tar.gz | |
patch 8.2.2473: crash when leaving command line window triggers autocommandv8.2.2473
Problem: Crash when leaving command line window triggers autocommand.
(houyunsong)
Solution: Make sure not to close the current window or buffer.
| -rw-r--r-- | src/ex_getln.c | 6 | ||||
| -rw-r--r-- | src/testdir/test_autocmd.vim | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c index d6712c126..faa56e14b 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -4403,12 +4403,12 @@ open_cmdwin(void) // win_goto() may trigger an autocommand that already closes the // cmdline window. - if (win_valid(wp)) + if (win_valid(wp) && wp != curwin) win_close(wp, TRUE); // win_close() may have already wiped the buffer when 'bh' is - // set to 'wipe' - if (bufref_valid(&bufref)) + // set to 'wipe', autocommands may have closed other windows + if (bufref_valid(&bufref) && bufref.br_buf != curbuf) close_buffer(NULL, bufref.br_buf, DOBUF_WIPE, FALSE, FALSE); // Restore window sizes. diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim index 8ccc753df..15d237ee1 100644 --- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -2774,4 +2774,13 @@ func Test_autocmd_normal_mess() augroup END endfunc +func Test_autocmd_closing_cmdwin() + au BufWinLeave * nested q + call assert_fails("norm 7q?\n", 'E855:') + + au! BufWinLeave + new + only +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index 1b0faaeee..254aafdb8 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 */ /**/ + 2473, +/**/ 2472, /**/ 2471, |