commit e67d546f3c691139e6d3d33f36724d98aec04c14
author Bram Moolenaar <Bram@vim.org> Sat Aug 27 22:40:42 2016 +0200
committer Bram Moolenaar <Bram@vim.org> Sat Aug 27 22:40:42 2016 +0200
tree 8d990c67d29e4085dcb259b43dad3bf76833b05c
parent 818078ddfbb8cc2546f697c5675a251d095722ec

patch 7.4.2275
Problem:    ":diffoff!" does not remove filler lines.
Solution:   Force a redraw and invalidate the cursor. (closes #1014)

src/testdir/test_diffmode.vim

diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim
index 7666594..5de394d 100644
--- a/src/testdir/test_diffmode.vim
+++ b/src/testdir/test_diffmode.vim
@@ -202,3 +202,19 @@
   bwipe!
   enew!
 endfunc
+
+func Test_diffoff()
+  enew!
+  call setline(1, ['Two', 'Three'])
+  let normattr = screenattr(1, 1)
+  diffthis
+  botright vert new
+  call setline(1, ['One', '', 'Two', 'Three'])
+  diffthis
+  redraw
+  diffoff!
+  redraw
+  call assert_equal(normattr, screenattr(1, 1))
+  bwipe!
+  bwipe!
+endfunc