Merge #5815 from lonerover/vim-7.4.2124

vim-patch: 7.4.2124, 7.4.2126

src/nvim/testdir/test_diffmode.vim

@@ -145,6 +145,8 @@ func Test_vert_split()
   call assert_equal(0, &cursorbind)
   call assert_equal(1, &wrap)
 
+  call delete('Xtest')
+  call delete('Xtest2')
   windo bw!
 endfunc
 
@@ -160,6 +162,43 @@ func Test_filler_lines()
   wincmd h
   call assert_equal(1, line('w0'))
   unlet! diff_fdm diff_fdc
-
+  windo diffoff
-  windo bw!
+  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

src/nvim/version.c

@@ -314,9 +314,9 @@ static int included_patches[] = {
   // 2129 NA
   2128,
   // 2127,
-  // 2126,
+  2126,
-  // 2125,
+  // 2125 NA
-  // 2124,
+  2124,
   2123,
   // 2122 NA
   // 2121,