diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2024-08-08 15:33:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-08 15:33:23 +0800 |
| commit | 2f1ea1133a47df782925ac88bc3cecb649fb0b23 (patch) | |
| tree | eeb9960c26113f3cde357b9111445f684f7de274 | |
| parent | f35d5afbf1bae81896d4b959c7d99cf50e0c306f (diff) | |
| parent | 94cc29392776df268e87e2344cf1b3bc466066da (diff) | |
| download | rneovim-2f1ea1133a47df782925ac88bc3cecb649fb0b23.tar.gz rneovim-2f1ea1133a47df782925ac88bc3cecb649fb0b23.tar.bz2 rneovim-2f1ea1133a47df782925ac88bc3cecb649fb0b23.zip | |
Merge pull request #30008 from zeertzjq/vim-8.2.3476
vim-patch:8.2.{3476,3477}
| -rw-r--r-- | src/nvim/buffer.c | 12 | ||||
| -rw-r--r-- | test/old/testdir/test_startup.vim | 32 |
2 files changed, 43 insertions, 1 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index 0c301bd5e2..ab648708fc 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -2959,7 +2959,17 @@ int setfname(buf_T *buf, char *ffname_arg, char *sfname_arg, bool message) obuf = buflist_findname_file_id(ffname, &file_id, file_id_valid); } if (obuf != NULL && obuf != buf) { - if (obuf->b_ml.ml_mfp != NULL) { // it's loaded, fail + bool in_use = false; + + // during startup a window may use a buffer that is not loaded yet + FOR_ALL_TAB_WINDOWS(tab, win) { + if (win->w_buffer == obuf) { + in_use = true; + } + } + + // it's loaded or used in a window, fail + if (obuf->b_ml.ml_mfp != NULL || in_use) { if (message) { emsg(_("E95: Buffer with this name already exists")); } diff --git a/test/old/testdir/test_startup.vim b/test/old/testdir/test_startup.vim index c80d98925a..ed4c4526f7 100644 --- a/test/old/testdir/test_startup.vim +++ b/test/old/testdir/test_startup.vim @@ -1276,4 +1276,36 @@ func Test_write_in_vimrc() call delete('Xvimrc') endfunc +func Test_echo_true_in_cmd() + CheckNotGui + + let lines =<< trim END + echo v:true + call writefile(['done'], 'Xresult') + quit + END + call writefile(lines, 'Xscript') + if RunVim([], [], '--cmd "source Xscript"') + call assert_equal(['done'], readfile('Xresult')) + endif + call delete('Xscript') + call delete('Xresult') +endfunc + +func Test_rename_buffer_on_startup() + CheckUnix + + let lines =<< trim END + call writefile(['done'], 'Xresult') + qa! + END + call writefile(lines, 'Xscript') + if RunVim([], [], "--clean -e -s --cmd 'file x|new|file x' --cmd 'so Xscript'") + call assert_equal(['done'], readfile('Xresult')) + endif + call delete('Xscript') + call delete('Xresult') +endfunc + + " vim: shiftwidth=2 sts=2 expandtab |