# HG changeset patch # User Bram Moolenaar # Date 1612039503 -3600 # Node ID 34a95c4bd6478b7009c3619af7293268eb79714c # Parent de88fbcda74a00113ba349e5a77db60699dd0c96 patch 8.2.2433: opening cmdline window gives error in BufLeave autocommand Commit: https://github.com/vim/vim/commit/b63f3ca66db20f7b135aae706d36be538f91f8cc Author: Bram Moolenaar Date: Sat Jan 30 21:40:03 2021 +0100 patch 8.2.2433: opening cmdline window gives error in BufLeave autocommand Problem: Opening cmdline window gives error in BufLeave autocommand. Solution: Reset cmdwin_type when triggering the autocommand. diff --git a/src/ex_cmds.c b/src/ex_cmds.c --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -2710,6 +2710,12 @@ do_ecmd( */ if (buf != curbuf) { +#ifdef FEAT_CMDWIN + int save_cmdwin_type = cmdwin_type; + + // BufLeave applies to the old buffer. + cmdwin_type = 0; +#endif /* * Be careful: The autocommands may delete any buffer and change * the current buffer. @@ -2724,6 +2730,9 @@ do_ecmd( new_name = vim_strsave(buf->b_fname); set_bufref(&au_new_curbuf, buf); apply_autocmds(EVENT_BUFLEAVE, NULL, NULL, FALSE, curbuf); +#ifdef FEAT_CMDWIN + cmdwin_type = save_cmdwin_type; +#endif if (!bufref_valid(&au_new_curbuf)) { // new buffer has been deleted diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim --- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -1237,6 +1237,7 @@ func Test_cmdwin_autocmd() augroup CmdWin au! + autocmd BufLeave * if &buftype == '' | update | endif autocmd CmdwinEnter * startinsert augroup END diff --git a/src/version.c b/src/version.c --- 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 */ /**/ + 2433, +/**/ 2432, /**/ 2431,