aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/testdir/test_diffmode.vim
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-02-13 15:51:37 -0500
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-02-13 16:15:00 -0500
commit34291eba80fd2c07cbb3e6310d684e4ac3594fc4 (patch)
tree91f30020abc9f807c23aa6a5d1f6f67c50b2c7f8 /src/nvim/testdir/test_diffmode.vim
parentcdace43b6c02ba2125dbcf3ce36d26ac8bb3e219 (diff)
downloadrneovim-34291eba80fd2c07cbb3e6310d684e4ac3594fc4.tar.gz
rneovim-34291eba80fd2c07cbb3e6310d684e4ac3594fc4.tar.bz2
rneovim-34291eba80fd2c07cbb3e6310d684e4ac3594fc4.zip
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.
Diffstat (limited to 'src/nvim/testdir/test_diffmode.vim')
-rw-r--r--src/nvim/testdir/test_diffmode.vim12
1 files changed, 12 insertions, 0 deletions
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