mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-30 15:08:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.1801: undo file not found when using ":args" or ":next"

Browse Source 
Problem:    Undo file not found when using ":args" or ":next".
Solution:   Handle like editing another file. (closes vim/vim#7072)
55b419b871
This commit is contained in:
Jan Edmund Lazo
2020-10-04 20:11:52 -04:00
parent b35b7222ee
commit 674844086b
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/ex_cmds.c
View File

@@ -2497,8 +2497,12 @@ int do_ecmd(
new_name = NULL;
}
set_bufref(&bufref, buf);
if (p_ur < 0 || curbuf->b_ml.ml_line_count <= p_ur) {
// Save all the text, so that the reload can be undone.
// If the buffer was used before, store the current contents so that
// the reload can be undone. Do not do this if the (empty) buffer is
// being re-used for another file.
if (!(curbuf->b_flags & BF_NEVERLOADED)
&& (p_ur < 0 || curbuf->b_ml.ml_line_count <= p_ur)) {
// Sync first so that this is a separate undo-able action.
u_sync(false);
if (u_savecommon(0, curbuf->b_ml.ml_line_count + 1, 0, true)

20
src/nvim/testdir/test_undo.vim
View File

@@ -392,6 +392,26 @@ func Test_rundo_errors()
call delete('Xundofile')
endfunc
func Test_undofile_next()
set undofile
new Xfoo.txt
execute "norm ix\<c-g>uy\<c-g>uz\<Esc>"
write
bwipe
next Xfoo.txt
call assert_equal('xyz', getline(1))
silent undo
call assert_equal('xy', getline(1))
silent undo
call assert_equal('x', getline(1))
bwipe!
call delete('Xfoo.txt')
call delete('.Xfoo.txt.un~')
set undofile&
endfunc
" Test for undo working properly when executing commands from a register.
" Also test this in an empty buffer.
func Test_cmd_in_reg_undo()