From fcb0b61d15f66f0e9116a6bc56d9d8105bb913cf Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 26 May 2020 20:22:01 +0200 Subject: [PATCH] patch 8.2.0829: filter() may give misleading error message Problem: filter() may give misleading error message. Solution: Also mention Blob as an allowed argument. --- src/list.c | 2 +- src/testdir/test_filter_map.vim | 4 ++-- src/version.c | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/list.c b/src/list.c index b9e7e340d..7c06cfce5 100644 --- a/src/list.c +++ b/src/list.c @@ -1768,7 +1768,7 @@ filter_map(typval_T *argvars, typval_T *rettv, int map) } else { - semsg(_(e_listdictarg), ermsg); + semsg(_(e_listdictblobarg), ermsg); return; } diff --git a/src/testdir/test_filter_map.vim b/src/testdir/test_filter_map.vim index 0f58685c6..8883ea3cc 100644 --- a/src/testdir/test_filter_map.vim +++ b/src/testdir/test_filter_map.vim @@ -92,8 +92,8 @@ endfunc func Test_map_filter_fails() call assert_fails('call map([1], "42 +")', 'E15:') call assert_fails('call filter([1], "42 +")', 'E15:') - call assert_fails("let l = map('abc', '\"> \" . v:val')", 'E712:') - call assert_fails("let l = filter('abc', '\"> \" . v:val')", 'E712:') + call assert_fails("let l = map('abc', '\"> \" . v:val')", 'E896:') + call assert_fails("let l = filter('abc', '\"> \" . v:val')", 'E896:') call assert_fails("let l = filter([1, 2, 3], '{}')", 'E728:') call assert_fails("let l = filter({'k' : 10}, '{}')", 'E728:') call assert_fails("let l = filter([1, 2], {})", 'E731:') diff --git a/src/version.c b/src/version.c index c2cb3ca69..f91ff1a99 100644 --- a/src/version.c +++ b/src/version.c @@ -746,6 +746,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 829, /**/ 828, /**/