From fc838d6cb0f22c77a6ee2befd034b593e1c5ea06 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 25 Jun 2020 22:23:48 +0200
Subject: patch 8.2.1058: multiline conceal causes display errors

Problem:    Multiline conceal causes display errors.
Solution:   Do not allow conceal cross over EOL. (closes #6326, closes #4854,
            closes #6302)
---
 src/testdir/test_diffmode.vim | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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

diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim
index 4544834b9..a3f6d5867 100644
--- a/src/testdir/test_diffmode.vim
+++ b/src/testdir/test_diffmode.vim
@@ -1118,4 +1118,16 @@ func Test_diff_rnu()
   call delete('Xtest_diff_rnu')
 endfunc
 
+func Test_diff_multilineconceal()
+  new
+  diffthis
+
+  new
+  call matchadd('Conceal', 'a\nb', 9, -1, {'conceal': 'Y'})
+  set cole=2 cocu=n
+  call setline(1, ["a", "b"])
+  diffthis
+  redraw
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
-- 
cgit v1.2.1