diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-10-19 08:16:53 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-19 08:16:53 +0800 |
| commit | bcd25b2009f1e503e13c9fbdf9de9fa9aac0dca2 (patch) | |
| tree | 8fd6e1b16af34a1ccbf9bab4d644b3a6f6fe4b37 | |
| parent | 22473672aa1ce005d3841d0838a21cd6c6b721f7 (diff) | |
| parent | 88eeb4d941a4ae3f75bbf4faae2882786e44f687 (diff) | |
| download | rneovim-bcd25b2009f1e503e13c9fbdf9de9fa9aac0dca2.tar.gz rneovim-bcd25b2009f1e503e13c9fbdf9de9fa9aac0dca2.tar.bz2 rneovim-bcd25b2009f1e503e13c9fbdf9de9fa9aac0dca2.zip | |
Merge pull request #20727 from zeertzjq/vim-9.0.0789
vim-patch:9.0.{0789,0790}
| -rw-r--r-- | src/nvim/buffer.c | 5 | ||||
| -rw-r--r-- | src/nvim/testdir/test_autocmd.vim | 21 |
2 files changed, 26 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..8c15249f97 100644 --- a/src/nvim/testdir/test_autocmd.vim +++ b/src/nvim/testdir/test_autocmd.vim @@ -3269,4 +3269,25 @@ 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() + " Should get E86, but it doesn't always happen (timing?) + silent! call Xautocmd_changelist() + + au! BufReadPre + au! FileChangedShell + delfunc Xautocmd_changelist + bwipe! Xerr + call delete('Xerr') +endfunc + " vim: shiftwidth=2 sts=2 expandtab |