summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-01-31 21:13:42 +0100
committerBram Moolenaar <Bram@vim.org>2020-01-31 21:13:42 +0100
commit705724e430abd10ffdd5f1a2bb5a8f9223ff5cdd (patch)
tree51489385f1e182edb46c39108fda58e4b118eea3
parenta259d8d30bc289764925fc42db1dbe774f0bb3f8 (diff)
patch 8.2.0186: a couple of tests may fail when features are missingv8.2.0186
Problem: A couple of tests may fail when features are missing. Solution: Check for features. (Dominique Pelle, closes #5561)
-rw-r--r--src/testdir/test_functions.vim2
-rw-r--r--src/testdir/test_highlight.vim1
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 1 deletions
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index 6629d42d56..4f417fa932 100644
--- 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 f63abee496..f718e90dfb 100644
--- 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 e7a6f6fab0..839617a1c2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 186,
+/**/
185,
/**/
184,