From 0dc4d8eaecc3acc26c3bee906d98097f9faa90bd Mon Sep 17 00:00:00 2001 From: Dominique Pelle Date: Sat, 18 Dec 2021 12:40:52 +0000 Subject: [PATCH] patch 8.2.3845: Vim9: test fails when the channel feature is missing MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Problem: Vim9: test fails when the channel feature is missing. Solution: Check for the channel feature. (Dominique Pellé, closes #9368) --- src/testdir/test_vim9_builtin.vim | 8 ++++++-- src/version.c | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim index c9255575e..aa5af0d89 100644 --- a/src/testdir/test_vim9_builtin.vim +++ b/src/testdir/test_vim9_builtin.vim @@ -2027,7 +2027,9 @@ def Test_luaeval() enddef def Test_map() - CheckDefAndScriptFailure2(['map(test_null_channel(), "1")'], 'E1013: Argument 1: type mismatch, expected list but got channel', 'E1228: List, Dictionary, Blob or String required for argument 1') + if has('channel') + CheckDefAndScriptFailure2(['map(test_null_channel(), "1")'], 'E1013: Argument 1: type mismatch, expected list but got channel', 'E1228: List, Dictionary, Blob or String required for argument 1') + endif CheckDefAndScriptFailure2(['map(1, "1")'], 'E1013: Argument 1: type mismatch, expected list but got number', 'E1228: List, Dictionary, Blob or String required for argument 1') enddef @@ -2144,7 +2146,9 @@ def Test_mapcheck() enddef def Test_mapnew() - CheckDefAndScriptFailure2(['mapnew(test_null_job(), "1")'], 'E1013: Argument 1: type mismatch, expected list but got job', 'E1228: List, Dictionary, Blob or String required for argument 1') + if has('channel') + CheckDefAndScriptFailure2(['mapnew(test_null_job(), "1")'], 'E1013: Argument 1: type mismatch, expected list but got job', 'E1228: List, Dictionary, Blob or String required for argument 1') + endif CheckDefAndScriptFailure2(['mapnew(1, "1")'], 'E1013: Argument 1: type mismatch, expected list but got number', 'E1228: List, Dictionary, Blob or String required for argument 1') enddef diff --git a/src/version.c b/src/version.c index dbf2fe5ac..262a330c6 100644 --- a/src/version.c +++ b/src/version.c @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 3845, /**/ 3844, /**/ -- 2.40.0