wyj/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-09-17 20:58:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30008 from zeertzjq/vim-8.2.3476

Browse Source 
vim-patch:8.2.{3476,3477}
This commit is contained in:
zeertzjq 2024-08-08 15:33:23 +08:00 committed by GitHub
commit 2f1ea1133a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/nvim/buffer.c
View File

@ -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"));
}

32
test/old/testdir/test_startup.vim
View File

@ -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