From 34291eba80fd2c07cbb3e6310d684e4ac3594fc4 Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Sat, 13 Feb 2021 15:51:37 -0500
Subject: vim-patch:8.2.1058: multiline conceal causes display errors

Problem:    Multiline conceal causes display errors.
Solution:   Do not allow conceal cross over EOL. (closes vim/vim#6326, closes vim/vim#4854,
            closes vim/vim#6302)
https://github.com/vim/vim/commit/fc838d6cb0f22c77a6ee2befd034b593e1c5ea06

Port test_conceal.vim but skip tests that require screendumps.
---
 src/nvim/testdir/test_diffmode.vim | 12 ++++++++++++
 1 file changed, 12 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 640de1bdc6..8a4276b2a6 100644
--- a/src/nvim/testdir/test_diffmode.vim
+++ b/src/nvim/testdir/test_diffmode.vim
@@ -1007,6 +1007,18 @@ 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
+
 func Test_diff_and_scroll()
   " this was causing an ml_get error
   set ls=2
-- 
cgit