diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-05-25 04:30:50 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-05-25 04:30:50 -0400 |
| commit | 1e22076a6561ae2dba820ff961795ddb571940ea (patch) | |
| tree | 6b034985d41c85f81858c834c98a50985157363c | |
| parent | 52348a1f8c9f4f91c96a7e2d5159127a8f7820ef (diff) | |
| parent | b37b5a59afd1a9c8bd91ffd4e67714c3f6c47f6d (diff) | |
| download | rneovim-1e22076a6561ae2dba820ff961795ddb571940ea.tar.gz rneovim-1e22076a6561ae2dba820ff961795ddb571940ea.tar.bz2 rneovim-1e22076a6561ae2dba820ff961795ddb571940ea.zip | |
Merge pull request #4741 from brcolow/vim-7.4.1281
vim-patch:7.4.1281
| -rw-r--r-- | src/nvim/testdir/test_viml.vim | 39 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 40 insertions, 1 deletions
diff --git a/src/nvim/testdir/test_viml.vim b/src/nvim/testdir/test_viml.vim index 9f0618bd45..2d989cdad9 100644 --- a/src/nvim/testdir/test_viml.vim +++ b/src/nvim/testdir/test_viml.vim @@ -922,6 +922,45 @@ func Test_curlies() call assert_equal(77, g:a['t']) endfunc +"------------------------------------------------------------------------------- +" Test 91: using type(). {{{1 +"------------------------------------------------------------------------------- + +func Test_type() + call assert_equal(0, type(0)) + call assert_equal(1, type("")) + call assert_equal(2, type(function("tr"))) + call assert_equal(3, type([])) + call assert_equal(4, type({})) + call assert_equal(5, type(0.0)) + call assert_equal(6, type(v:false)) + call assert_equal(6, type(v:true)) + call assert_equal(7, type(v:null)) +endfunc + +"------------------------------------------------------------------------------- +" Test 92: skipping code {{{1 +"------------------------------------------------------------------------------- + +func Test_skip() + let Fn = function('Test_type') + call assert_false(0 && Fn[1]) + call assert_false(0 && string(Fn)) + call assert_false(0 && len(Fn)) + let l = [] + call assert_false(0 && l[1]) + call assert_false(0 && string(l)) + call assert_false(0 && len(l)) + let f = 1.0 + call assert_false(0 && f[1]) + call assert_false(0 && string(f)) + call assert_false(0 && len(f)) + let sp = v:null + call assert_false(0 && sp[1]) + call assert_false(0 && string(sp)) + call assert_false(0 && len(sp)) + +endfunc "------------------------------------------------------------------------------- " Modelines {{{1 diff --git a/src/nvim/version.c b/src/nvim/version.c index 4619acd9e7..c19e1b01c2 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -403,7 +403,7 @@ static int included_patches[] = { 1284, // 1283 NA 1282, - // 1281, + 1281, // 1280 NA // 1279 NA // 1278 NA |