summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-07-07 16:35:16 +0200
committerBram Moolenaar <Bram@vim.org>2016-07-07 16:35:16 +0200
commit05e418d436410cd8bbf5a29ff81e8ad68408b1e8 (patch)
treeb6cd83052d2787729019a66b1f1d81663fc9da50 /src
parent6bb450145e96d7b182769fd9502a267da72667ec (diff)
patch 7.4.1994v7.4.1994
Problem: True-false test fails. Solution: Filter the dict to only keep the value that matters.
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_true_false.vim8
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/src/testdir/test_true_false.vim b/src/testdir/test_true_false.vim
index f11d298ee6..a23f2cc4b1 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 996745596b..8bb497d027 100644
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1994,
+/**/
1993,
/**/
1992,