Mercurial > vim
comparison src/testdir/test_diffmode.vim @ 14972:5d52b21b2e7f v8.1.0497
patch 8.1.0497: :%diffput changes order of lines
commit https://github.com/vim/vim/commit/5f57bdcab77bc417ae0357fe8ad6c7259b6d25df
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Oct 25 17:52:23 2018 +0200
patch 8.1.0497: :%diffput changes order of lines
Problem: :%diffput changes order of lines. (Markus Braun)
Solution: Do adjust marks when using internal diff.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 25 Oct 2018 18:00:07 +0200 |
| parents | 291656f731c9 |
| children | 28fde4aa8534 |
comparison
equal
deleted
inserted
replaced
| 14971:134ea82de781 | 14972:5d52b21b2e7f |
|---|---|
| 219 | 219 |
| 220 windo diffoff | 220 windo diffoff |
| 221 %bwipe! | 221 %bwipe! |
| 222 endfunc | 222 endfunc |
| 223 | 223 |
| 224 " Test putting two changes from one buffer to another | |
| 225 func Test_diffput_two() | |
| 226 new a | |
| 227 let win_a = win_getid() | |
| 228 call setline(1, range(1, 10)) | |
| 229 diffthis | |
| 230 new b | |
| 231 let win_b = win_getid() | |
| 232 call setline(1, range(1, 10)) | |
| 233 8del | |
| 234 5del | |
| 235 diffthis | |
| 236 call win_gotoid(win_a) | |
| 237 %diffput | |
| 238 call win_gotoid(win_b) | |
| 239 call assert_equal(map(range(1, 10), 'string(v:val)'), getline(1, '$')) | |
| 240 bwipe! a | |
| 241 bwipe! b | |
| 242 endfunc | |
| 243 | |
| 224 func Test_dp_do_buffer() | 244 func Test_dp_do_buffer() |
| 225 e! one | 245 e! one |
| 226 let bn1=bufnr('%') | 246 let bn1=bufnr('%') |
| 227 let l = range(60) | 247 let l = range(60) |
| 228 call setline(1, l) | 248 call setline(1, l) |