From: Bram Moolenaar Date: Thu, 7 Jul 2016 14:35:16 +0000 (+0200) Subject: patch 7.4.1994 X-Git-Tag: v7.4.1994 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=05e418d436410cd8bbf5a29ff81e8ad68408b1e8;p=vim patch 7.4.1994 Problem: True-false test fails. Solution: Filter the dict to only keep the value that matters. --- diff --git a/src/testdir/test_true_false.vim b/src/testdir/test_true_false.vim index f11d298ee..a23f2cc4b 100644 --- a/src/testdir/test_true_false.vim +++ b/src/testdir/test_true_false.vim @@ -91,8 +91,14 @@ func Test_true_false_arg() call Try_arg_true_false('index(["a", "A"], "A", 0, %v%)', 1, 0) + function FilterMapArg(d) + if type(a:d) == type({}) + return filter(a:d, 'v:key == "rhs"') + endif + return a:d + endfunction call Try_arg_true_false('maparg("asdf", "i", %v%)', "", "asdff") - call Try_arg_true_false('maparg("asdf", "i", 1, %v%)', "asdff", {'silent': 0, 'noremap': 0, 'lhs': 'asdf', 'mode': '!', 'nowait': 0, 'expr': 0, 'sid': 3, 'rhs': 'asdff', 'buffer': 0}) + call Try_arg_true_false('FilterMapArg(maparg("asdf", "i", 1, %v%))', "asdff", {'rhs': 'asdff'}) call Try_arg_true_false('hasmapto("asdf", "i", %v%)', 0, 1) diff --git a/src/version.c b/src/version.c index 996745596..8bb497d02 100644 --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1994, /**/ 1993, /**/