From 1fa6d95c67852b7f3c9cba06ca4bc48620f344db Mon Sep 17 00:00:00 2001 From: James McCoy Date: Mon, 27 Feb 2017 15:05:03 -0500 Subject: vim-patch:7.4.1994 Problem: True-false test fails. Solution: Filter the dict to only keep the value that matters. https://github.com/vim/vim/commit/05e418d436410cd8bbf5a29ff81e8ad68408b1e8 --- src/nvim/testdir/test_true_false.vim | 8 +++++++- src/nvim/version.c | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/nvim/testdir/test_true_false.vim b/src/nvim/testdir/test_true_false.vim index c134693192..84aca737ac 100644 --- a/src/nvim/testdir/test_true_false.vim +++ b/src/nvim/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/nvim/version.c b/src/nvim/version.c index 042c41df76..d95c62ef01 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -446,7 +446,7 @@ static int included_patches[] = { 1997, 1996, // 1995 NA - // 1994, + 1994, 1993, 1992, 1991, -- cgit