IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0192: drop: don't rewind when editing the same file

Browse Source 
Problem:  :drop tries to :rewind the argumentlist, which results in E37
          (after v9.1.0046)
Solution: instead of calling ex_rewind(), call open_buffer() only when
          re-using the initial empty buffer

fixes: vim/vim#14219
closes: vim/vim#14220

978178823b

Co-authored-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq 2024-03-21 07:34:43 +08:00
parent 774455dc37
commit 271879dd49
3 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/ex_cmds2.c
View File

@ -870,7 +870,9 @@ void ex_drop(exarg_T *eap)
buf_check_timestamp(curbuf);
curbuf->b_p_ar = save_ar;
}
ex_rewind(eap);
if (buf->b_ml.ml_flags & ML_EMPTY) {
open_buffer(false, eap, 0);
}
return;
}
}

20
test/functional/ex_cmds/drop_spec.lua
View File

@ -2,6 +2,7 @@ local helpers = require('test.functional.helpers')(after_each)
local command = helpers.command
local Screen = require('test.functional.ui.screen')
local clear, feed, feed_command = helpers.clear, helpers.feed, helpers.feed_command
local exec = helpers.exec
describe(':drop', function()
local screen
@ -16,7 +17,7 @@ describe(':drop', function()
[2] = { reverse = true },
[3] = { bold = true },
})
command('set laststatus=2 shortmess-=F')
command('set nohidden laststatus=2 shortmess-=F')
end)
it('works like :e when called with only one window open', function()
@ -43,7 +44,6 @@ describe(':drop', function()
end)
it("splits off a new window when a buffer can't be abandoned", function()
command('set nohidden')
feed_command('edit tmp1')
feed_command('vsplit')
feed_command('edit tmp2')
@ -59,4 +59,20 @@ describe(':drop', function()
"tmp3" [New] |
]])
end)
-- oldtest: Test_drop_modified_file()
it('does not cause E37 with modified same file', function()
exec([[
edit Xdrop_modified.txt
call setline(1, 'The quick brown fox jumped over the lazy dogs')
]])
feed_command('drop Xdrop_modified.txt')
screen:expect([[
^The quick brown fox jumped over the|
lazy dogs |
{0:~ }|*6
{1:Xdrop_modified.txt [+] }|
"Xdrop_modified.txt" [New] |
]])
end)
end)

16
test/old/testdir/test_excmd.vim
View File

@ -3,6 +3,7 @@
source check.vim
source shared.vim
source term_util.vim
source screendump.vim
func Test_ex_delete()
new
@ -758,4 +759,19 @@ func Test_ex_address_range_overflow()
call assert_fails(':--+foobar', 'E492:')
endfunc
func Test_drop_modified_file()
CheckScreendump
let lines =<< trim END
call setline(1, 'The quick brown fox jumped over the lazy dogs')
END
call writefile([''], 'Xdrop_modified.txt', 'D')
call writefile(lines, 'Xtest_drop_modified', 'D')
let buf = RunVimInTerminal('-S Xtest_drop_modified Xdrop_modified.txt', {'rows': 10,'columns': 40})
call term_sendkeys(buf, ":drop Xdrop_modified.txt\<CR>")
call VerifyScreenDump(buf, 'Test_drop_modified_1', {})
" clean up
call StopVimInTerminal(buf)
endfunc
" vim: shiftwidth=2 sts=2 expandtab