summaryrefslogtreecommitdiff
path: root/src/testdir/test_diffmode.vim
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-06-25 22:23:48 +0200
committerBram Moolenaar <Bram@vim.org>2020-06-25 22:23:48 +0200
commitfc838d6cb0f22c77a6ee2befd034b593e1c5ea06 (patch)
tree460d06257776232261d5e716511c2544786ba38e /src/testdir/test_diffmode.vim
parent1e4c7d0ed272201fa3a7cf34a462abb139170759 (diff)
downloadvim-git-fc838d6cb0f22c77a6ee2befd034b593e1c5ea06.tar.gz
patch 8.2.1058: multiline conceal causes display errorsv8.2.1058
Problem: Multiline conceal causes display errors. Solution: Do not allow conceal cross over EOL. (closes #6326, closes #4854, closes #6302)
Diffstat (limited to 'src/testdir/test_diffmode.vim')
-rw-r--r--src/testdir/test_diffmode.vim12
1 files changed, 12 insertions, 0 deletions
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