diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-10-19 07:10:22 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-10-19 07:14:59 +0800 |
| commit | 66933b45dcff8cc9f323a71583bca3698566abb9 (patch) | |
| tree | 5c0f979e7c17e61b17ec729ad7cb5bd0dc2e1f01 /src | |
| parent | 22473672aa1ce005d3841d0838a21cd6c6b721f7 (diff) | |
| download | rneovim-66933b45dcff8cc9f323a71583bca3698566abb9.tar.gz rneovim-66933b45dcff8cc9f323a71583bca3698566abb9.tar.bz2 rneovim-66933b45dcff8cc9f323a71583bca3698566abb9.zip | |
vim-patch:9.0.0789: dummy buffer ends up in a window
Problem: Dummy buffer ends up in a window.
Solution: Disallow navigating to a dummy buffer.
https://github.com/vim/vim/commit/8f3c3c6cd044e3b5bf08dbfa3b3f04bb3f711bad
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/buffer.c | 5 | ||||
| -rw-r--r-- | src/nvim/testdir/test_autocmd.vim | 20 |
2 files changed, 25 insertions, 0 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index 84ff2fa59b..8016904702 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -1224,6 +1224,11 @@ int do_buffer(int action, int start, int dir, int count, int forceit) } return FAIL; } + if ((action == DOBUF_GOTO || action == DOBUF_SPLIT) && (buf->b_flags & BF_DUMMY)) { + // disallow navigating to the dummy buffer + semsg(_(e_nobufnr), count); + return FAIL; + } // delete buffer "buf" from memory and/or the list if (unload) { diff --git a/src/nvim/testdir/test_autocmd.vim b/src/nvim/testdir/test_autocmd.vim index f98d7d10ab..e869353893 100644 --- a/src/nvim/testdir/test_autocmd.vim +++ b/src/nvim/testdir/test_autocmd.vim @@ -3269,4 +3269,24 @@ func Test_noname_autocmd() augroup! test_noname_autocmd_group endfunc +func Test_autocmd_split_dummy() + " Autocommand trying to split a window containing a dummy buffer. + auto BufReadPre * exe "sbuf " .. expand("<abuf>") + " Avoid the "W11" prompt + au FileChangedShell * let v:fcs_choice = 'reload' + func Xautocmd_changelist() + cal writefile(['Xtestfile2:4:4'], 'Xerr') + edit Xerr + lex 'Xtestfile2:4:4' + endfunc + call Xautocmd_changelist() + call assert_fails('call Xautocmd_changelist()', 'E86:') + + au! BufReadPre + au! FileChangedShell + delfunc Xautocmd_changelist + bwipe! Xerr + call delete('Xerr') +endfunc + " vim: shiftwidth=2 sts=2 expandtab |