Mercurial > vim
changeset 23863:a91f3147d06e v8.2.2473
patch 8.2.2473: crash when leaving command line window triggers autocommand
Commit: https://github.com/vim/vim/commit/8c6951fa2836a1ae3257770e7b927a9380439912
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Feb 6 18:08:45 2021 +0100
patch 8.2.2473: crash when leaving command line window triggers autocommand
Problem: Crash when leaving command line window triggers autocommand.
(houyunsong)
Solution: Make sure not to close the current window or buffer.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 06 Feb 2021 18:15:06 +0100 |
| parents | 9afc3816a133 |
| children | de93a3b7f996 |
| files | src/ex_getln.c src/testdir/test_autocmd.vim src/version.c |
| diffstat | 3 files changed, 14 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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