patch 8.0.0205: wrong behavior after :undojoin
Problem: After :undojoin some commands don't work properly, such as :redo.
(Matthew Malcomson)
Solution: Don't set curbuf->b_u_curhead. (closes #1390)
diff --git a/src/testdir/test_undo.vim b/src/testdir/test_undo.vim
index f2ac6a8..06732af 100644
--- a/src/testdir/test_undo.vim
+++ b/src/testdir/test_undo.vim
@@ -176,7 +176,17 @@
call assert_equal(['aaaa', 'bbbb', 'cccc'], getline(2, '$'))
call feedkeys("u", 'xt')
call assert_equal(['aaaa'], getline(2, '$'))
- close!
+ bwipe!
+endfunc
+
+func Test_undojoin_redo()
+ new
+ call setline(1, ['first line', 'second line'])
+ call feedkeys("ixx\<Esc>", 'xt')
+ call feedkeys(":undojoin | redo\<CR>", 'xt')
+ call assert_equal('xxfirst line', getline(1))
+ call assert_equal('second line', getline(2))
+ bwipe!
endfunc
func Test_undo_write()
diff --git a/src/undo.c b/src/undo.c
index 607f35f..b69f318 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -3136,11 +3136,8 @@
if (get_undolevel() < 0)
return; /* no entries, nothing to do */
else
- {
- /* Go back to the last entry */
- curbuf->b_u_curhead = curbuf->b_u_newhead;
- curbuf->b_u_synced = FALSE; /* no entries, nothing to do */
- }
+ /* Append next change to the last entry */
+ curbuf->b_u_synced = FALSE;
}
/*
diff --git a/src/version.c b/src/version.c
index a99c17e..766f989 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 205,
+/**/
204,
/**/
203,