Mercurial > vim
comparison src/testdir/test_diffmode.vim @ 11065:f5bd684e47a1 v8.0.0421
patch 8.0.0421: diff mode wrong when adding line at end of buffer
commit https://github.com/vim/vim/commit/f58a8475e17bd566760fc7e2a17d35ddf4edacf2
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Mar 5 18:03:04 2017 +0100
patch 8.0.0421: diff mode wrong when adding line at end of buffer
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)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 05 Mar 2017 18:15:04 +0100 |
| parents | c0d5e8ab1452 |
| children | ae45d497868f |
comparison
equal
deleted
inserted
replaced
| 11064:1901db360ca6 | 11065:f5bd684e47a1 |
|---|---|
| 345 call assert_fails('norm dp', 'E793:') | 345 call assert_fails('norm dp', 'E793:') |
| 346 setl nomodifiable | 346 setl nomodifiable |
| 347 call assert_fails('norm do', 'E21:') | 347 call assert_fails('norm do', 'E21:') |
| 348 %bwipe! | 348 %bwipe! |
| 349 endfunc | 349 endfunc |
| 350 | |
| 351 func Test_diff_lastline() | |
| 352 enew! | |
| 353 only! | |
| 354 call setline(1, ['This is a ', 'line with five ', 'rows']) | |
| 355 diffthis | |
| 356 botright vert new | |
| 357 call setline(1, ['This is', 'a line with ', 'four rows']) | |
| 358 diffthis | |
| 359 1 | |
| 360 call feedkeys("Je a\<CR>", 'tx') | |
| 361 call feedkeys("Je a\<CR>", 'tx') | |
| 362 let w1lines = winline() | |
| 363 wincmd w | |
| 364 $ | |
| 365 let w2lines = winline() | |
| 366 call assert_equal(w2lines, w1lines) | |
| 367 bwipe! | |
| 368 bwipe! | |
| 369 endfunc |