From 7629176fb11be234882c64e3bf92d97839301fe4 Mon Sep 17 00:00:00 2001
From: lonerover <pathfinder1644@yahoo.com>
Date: Tue, 7 Feb 2017 15:46:19 +0800
Subject: vim-patch:7.4.2275

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

https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
---
 src/nvim/testdir/test_diffmode.vim | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'src/nvim/testdir/test_diffmode.vim')

diff --git a/src/nvim/testdir/test_diffmode.vim b/src/nvim/testdir/test_diffmode.vim
index 7666594862..5de394de8e 100644
--- a/src/nvim/testdir/test_diffmode.vim
+++ b/src/nvim/testdir/test_diffmode.vim
@@ -202,3 +202,19 @@ func Test_diffget_diffput()
   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
-- 
cgit