Patch 8.0.0381
Problem: Diff mode is not sufficiently tested.
Solution: Add more diff mode tests. (Dominique Pelle, closes #1515)
Files: src/testdir/test_diffmode.vim
*** ../vim-8.0.0380/src/testdir/test_diffmode.vim 2017-02-03
23:16:24.349040487 +0100
--- src/testdir/test_diffmode.vim 2017-02-26 19:57:47.275393904 +0100
***************
*** 272,274 ****
--- 272,349 ----
call delete('Xtest1')
call delete('Xtest2')
endfunc
+
+ func Test_diff_move_to()
+ new
+ call setline(1, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
+ diffthis
+ vnew
+ call setline(1, [1, '2x', 3, 4, 4, 5, '6x', 7, '8x', 9, '10x'])
+ diffthis
+ norm ]c
+ call assert_equal(2, line('.'))
+ norm 3]c
+ call assert_equal(9, line('.'))
+ norm 10]c
+ call assert_equal(11, line('.'))
+ norm [c
+ call assert_equal(9, line('.'))
+ norm 2[c
+ call assert_equal(5, line('.'))
+ norm 10[c
+ call assert_equal(2, line('.'))
+ %bwipe!
+ endfunc
+
+ func Test_diffpatch()
+ " The patch program on MS-Windows may fail or hang.
+ if !executable('patch') || !has('unix')
+ return
+ endif
+ new
+ insert
+ ***************
+ *** 1,3 ****
+ 1
+ ! 2
+ 3
+ --- 1,4 ----
+ 1
+ ! 2x
+ 3
+ + 4
+ .
+ saveas Xpatch
+ bwipe!
+ new
+ call assert_fails('diffpatch Xpatch', 'E816:')
+ call setline(1, ['1', '2', '3'])
+ diffpatch Xpatch
+ call assert_equal(['1', '2x', '3', '4'], getline(1, '$'))
+ call delete('Xpatch')
+ bwipe!
+ endfunc
+
+ func Test_diff_too_many_buffers()
+ for i in range(1, 8)
+ exe "new Xtest" . i
+ diffthis
+ endfor
+ new Xtest9
+ call assert_fails('diffthis', 'E96:')
+ %bwipe!
+ endfunc
+
+ func Test_diff_nomodifiable()
+ new
+ call setline(1, [1, 2, 3, 4])
+ setl nomodifiable
+ diffthis
+ vnew
+ call setline(1, ['1x', 2, 3, 3, 4])
+ diffthis
+ call assert_fails('norm dp', 'E793:')
+ setl nomodifiable
+ call assert_fails('norm do', 'E21:')
+ %bwipe!
+ endfunc
*** ../vim-8.0.0380/src/version.c 2017-02-26 19:40:55.869921651 +0100
--- src/version.c 2017-02-26 19:45:56.199986586 +0100
***************
*** 766,767 ****
--- 766,769 ----
{ /* Add new patch number below this line */
+ /**/
+ 381,
/**/
--
How To Keep A Healthy Level Of Insanity:
11. Specify that your drive-through order is "to go".
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
