aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-04 05:25:06 -04:00
Code Activity

patch 8.0.0421: diff mode wrong when adding line at end of buffer

Browse Source 
Problem:    Diff mode is displayed wrong when adding a line at the end of a
            buffer.
Solution:   Adjust marks in diff mode. (James McCoy, closes #1329)
This commit is contained in:
Bram Moolenaar
2017-03-05 18:03:04 +01:00
parent 2c7292dc5b
commit f58a8475e1
4 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/testdir/test_diffmode.vim
View File

@@ -347,3 +347,23 @@ func Test_diff_nomodifiable()
call assert_fails('norm do', 'E21:')
%bwipe!
endfunc
func Test_diff_lastline()
enew!
only!
call setline(1, ['This is a ', 'line with five ', 'rows'])
diffthis
botright vert new
call setline(1, ['This is', 'a line with ', 'four rows'])
diffthis
1
call feedkeys("Je a\<CR>", 'tx')
call feedkeys("Je a\<CR>", 'tx')
let w1lines = winline()
wincmd w
$
let w2lines = winline()
call assert_equal(w2lines, w1lines)
bwipe!
bwipe!
endfunc