summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-01-23 12:42:55 +0000
committerBram Moolenaar <Bram@vim.org>2022-01-23 12:42:55 +0000
commit206919191fe1881dea00d60d392cc68a07c0106f (patch)
tree30b1f1eea770f72ba228f9bf8bcd5bb4c8aa55f2 /src
parentd1c58999c82afbdcbbe01548c1dea06d4d086f3e (diff)
downloadvim-git-206919191fe1881dea00d60d392cc68a07c0106f.tar.gz
patch 8.2.4190: all conceal tests are skipped without the screendumps featurev8.2.4190
Problem: All conceal tests are skipped without the screendumps feature. Solution: Only skip the tests that use screendumps. (closes #9599)
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_conceal.vim7
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/src/testdir/test_conceal.vim b/src/testdir/test_conceal.vim
index 3a24b7fd9..cf4194d71 100644
--- a/src/testdir/test_conceal.vim
+++ b/src/testdir/test_conceal.vim
@@ -4,9 +4,10 @@ source check.vim
CheckFeature conceal
source screendump.vim
-CheckScreendump
func Test_conceal_two_windows()
+ CheckScreendump
+
let code =<< trim [CODE]
let lines = ["one one one one one", "two |hidden| here", "three |hidden| three"]
call setline(1, lines)
@@ -111,6 +112,8 @@ func Test_conceal_two_windows()
endfunc
func Test_conceal_with_cursorline()
+ CheckScreendump
+
" Opens a help window, where 'conceal' is set, switches to the other window
" where 'cursorline' needs to be updated when the cursor moves.
let code =<< trim [CODE]
@@ -138,6 +141,8 @@ func Test_conceal_with_cursorline()
endfunc
func Test_conceal_resize_term()
+ CheckScreendump
+
let code =<< trim [CODE]
call setline(1, '`one` `two` `three` `four` `five`, the backticks should be concealed')
setl cocu=n cole=3
diff --git a/src/version.c b/src/version.c
index dfbd0c665..462ba9fa9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4190,
+/**/
4189,
/**/
4188,