Mercurial > vim
changeset 10631:cbf17371627c v8.0.0205
patch 8.0.0205: wrong behavior after :undojoin
commit https://github.com/vim/vim/commit/5e4e1b12998b1ed99138cad1c5da4d430f798547
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Jan 17 22:09:45 2017 +0100
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)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 17 Jan 2017 22:15:04 +0100 |
parents | a7d9b73e8f3c |
children | e81ab6925e7e |
files | src/testdir/test_undo.vim src/undo.c src/version.c |
diffstat | 3 files changed, 15 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_undo.vim +++ b/src/testdir/test_undo.vim @@ -176,7 +176,17 @@ func Test_undojoin() 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()
--- a/src/undo.c +++ b/src/undo.c @@ -3136,11 +3136,8 @@ ex_undojoin(exarg_T *eap UNUSED) 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; } /*