summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominique Pelle <dominique.pelle@gmail.com>2021-07-25 15:41:44 +0200
committerBram Moolenaar <Bram@vim.org>2021-07-25 15:41:44 +0200
commit2ec28aec9d4f1b9c1c008e36adde9fc82affae0f (patch)
tree68b5228dd85544637768458dd4bfcb7d1edbefc7
parent7a4ca32175bef0f9a177052796bd9addd10dc218 (diff)
patch 8.2.3220: Test_term_setansicolors() fails in some configurationsv8.2.3220
Problem: Test_term_setansicolors() fails in some configurations. Solution: Check available features. (Dominique Pellé, closes #8636)
-rw-r--r--src/testdir/test_vim9_builtin.vim9
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 2 deletions
diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim
index f2d6e64154..e1316a0656 100644
--- a/src/testdir/test_vim9_builtin.vim
+++ b/src/testdir/test_vim9_builtin.vim
@@ -3352,8 +3352,13 @@ enddef
def Test_term_setansicolors()
CheckRunVimInTerminal
- CheckDefAndScriptFailure2(['term_setansicolors([], "p")'], 'E1013: Argument 1: type mismatch, expected string but got list<unknown>', 'E1174: String required for argument 1')
- CheckDefAndScriptFailure2(['term_setansicolors(10, {})'], 'E1013: Argument 2: type mismatch, expected list<any> but got dict<unknown>', 'E1211: List required for argument 2')
+
+ if has('termguicolors') || has('gui')
+ CheckDefAndScriptFailure2(['term_setansicolors([], "p")'], 'E1013: Argument 1: type mismatch, expected string but got list<unknown>', 'E1174: String required for argument 1')
+ CheckDefAndScriptFailure2(['term_setansicolors(10, {})'], 'E1013: Argument 2: type mismatch, expected list<any> but got dict<unknown>', 'E1211: List required for argument 2')
+ else
+ throw 'Skipped: Only works with termguicolors or gui feature'
+ endif
enddef
def Test_term_setapi()
diff --git a/src/version.c b/src/version.c
index ac5989f6f5..af7a7fe867 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3220,
+/**/
3219,
/**/
3218,