Patch 7.4.2126
Problem: No tests for :diffget and :diffput
Solution: Add tests.
Files: src/testdir/test_diffmode.vim
*** ../vim-7.4.2125/src/testdir/test_diffmode.vim 2016-07-30
16:35:57.279063628 +0200
--- src/testdir/test_diffmode.vim 2016-07-30 18:10:06.149398587 +0200
***************
*** 162,167 ****
wincmd h
call assert_equal(1, line('w0'))
unlet! diff_fdm diff_fdc
! windo bw!
endfunc
--- 162,204 ----
wincmd h
call assert_equal(1, line('w0'))
unlet! diff_fdm diff_fdc
+ windo diffoff
+ bwipe!
+ enew!
+ endfunc
+
+ func Test_diffget_diffput()
+ enew!
+ let l = range(50)
+ call setline(1, l)
+ call assert_fails('diffget', 'E99:')
+ diffthis
+ call assert_fails('diffget', 'E100:')
+ new
+ let l[10] = 'one'
+ let l[20] = 'two'
+ let l[30] = 'three'
+ let l[40] = 'four'
+ call setline(1, l)
+ diffthis
+ call assert_equal('one', getline(11))
+ 11diffget
+ call assert_equal('10', getline(11))
+ 21diffput
+ wincmd w
+ call assert_equal('two', getline(21))
+ normal 31Gdo
+ call assert_equal('three', getline(31))
+ call assert_equal('40', getline(41))
+ normal 41Gdp
+ wincmd w
+ call assert_equal('40', getline(41))
+ new
+ diffthis
+ call assert_fails('diffget', 'E101:')
! windo diffoff
! bwipe!
! bwipe!
! enew!
endfunc
*** ../vim-7.4.2125/src/version.c 2016-07-30 16:40:34.784374573 +0200
--- src/version.c 2016-07-30 17:55:37.361522813 +0200
***************
*** 765,766 ****
--- 765,768 ----
{ /* Add new patch number below this line */
+ /**/
+ 2126,
/**/
--
A special cleaning ordinance bans housewives from hiding dirt and dust under a
rug in a dwelling.
[real standing law in Pennsylvania, United States of America]
/// 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.
