patch 8.2.0186: a couple of tests may fail when features are missing

Problem:    A couple of tests may fail when features are missing.
Solution:   Check for features. (Dominique Pelle, closes #5561)

diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index 6629d42d56b63d84b850a2f948a26dac35e0244e..4f417fa932e07920322ba8728fea7f0f96b92516 100644 (file)
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -1999,7 +1999,7 @@ func Test_range()
   set tagfunc=
   
   " term_start()
-  if has('terminal')
+  if has('terminal') && has('termguicolors')
     call assert_fails('call term_start(range(3, 4))', 'E474:')
     let g:terminal_ansi_colors = range(16)
     call assert_fails('call term_start("ls", #{term_finish: "close"})', 'E475:')

diff --git a/src/testdir/test_highlight.vim b/src/testdir/test_highlight.vim
index f63abee4960ee139173b0657b6bb6af8b2d77d0c..f718e90dfbd6c54e2bc6c9b769a50f1299f8f0f7 100644 (file)
--- a/src/testdir/test_highlight.vim
+++ b/src/testdir/test_highlight.vim
@@ -622,6 +622,7 @@ endfunc
 
 func Test_wincolor_listchars()
   CheckScreendump
+  CheckFeature conceal
 
   let lines =<< trim END
        call setline(1, ["one","\t\tsome random text enough long to show 'extends' and 'precedes' includingnbsps, preceding tabs and trailing spaces    ","three"])

diff --git a/src/version.c b/src/version.c
index e7a6f6fab04b029c8f1152d6eb0adfd750222487..839617a1c2ac8efa9ee5c08645bf21356bb4dae7 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    186,
 /**/
     185,
 /**/