aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2017-02-27 15:00:51 -0500
committerJames McCoy <jamessan@jamessan.com>2017-02-27 15:04:54 -0500
commitf863b23fd9aa53e65cd0e79957e9cfcff216af29 (patch)
tree28eb238c204df5ae88f6fb80de52db6141b9cbc1
parent2f5aee561e94703f09b8cb85dfd5a42b06153992 (diff)
downloadrneovim-f863b23fd9aa53e65cd0e79957e9cfcff216af29.tar.gz
rneovim-f863b23fd9aa53e65cd0e79957e9cfcff216af29.tar.bz2
rneovim-f863b23fd9aa53e65cd0e79957e9cfcff216af29.zip
vim-patch:7.4.1993
Problem: Not all TRUE and FALSE arguments are tested. Solution: Add a few more tests. https://github.com/vim/vim/commit/6bb450145e96d7b182769fd9502a267da72667ec
-rw-r--r--src/nvim/testdir/test_true_false.vim19
-rw-r--r--src/nvim/version.c2
2 files changed, 20 insertions, 1 deletions
diff --git a/src/nvim/testdir/test_true_false.vim b/src/nvim/testdir/test_true_false.vim
index ab557b3fd8..c134693192 100644
--- a/src/nvim/testdir/test_true_false.vim
+++ b/src/nvim/testdir/test_true_false.vim
@@ -85,6 +85,25 @@ func Test_true_false_arg()
call Try_arg_true_false('globpath(".", "Xlink", 0, 0, %v%)', "", "./Xlink")
silent !rm Xlink
endif
+
+ abbr asdf asdff
+ call Try_arg_true_false('hasmapto("asdff", "i", %v%)', 0, 1)
+
+ call Try_arg_true_false('index(["a", "A"], "A", 0, %v%)', 1, 0)
+
+ 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('hasmapto("asdf", "i", %v%)', 0, 1)
+
+ new colored
+ call setline(1, '<here>')
+ syn match brackets "<.*>"
+ syn match here "here" transparent
+ let brackets_id = synID(1, 1, 0)
+ let here_id = synID(1, 3, 0)
+ call Try_arg_true_false('synID(1, 3, %v%)', here_id, brackets_id)
+ bwipe!
endfunc
function Try_arg_non_zero(expr, false_val, true_val)
diff --git a/src/nvim/version.c b/src/nvim/version.c
index c007acba14..042c41df76 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -447,7 +447,7 @@ static int included_patches[] = {
1996,
// 1995 NA
// 1994,
- // 1993,
+ 1993,
1992,
1991,
1990,