diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-07 19:27:53 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-07 19:27:53 +0100 |
| commit | ea8c219ca852cc8eaf603b1bf475edf95e2850cf (patch) | |
| tree | b21e3817ce3fc22adff5e1a4af8b903e71bf2907 /src | |
| parent | eba6d8c66c3511a5e1bfe6ffa30c8bea47d129ad (diff) | |
| download | vim-git-ea8c219ca852cc8eaf603b1bf475edf95e2850cf.tar.gz | |
patch 7.4.1281v7.4.1281
Problem: No test for skipping over code that isn't evaluated.
Solution: Add a test with code that would fail when not skipped.
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test_viml.vim | 24 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 26 insertions, 0 deletions
diff --git a/src/testdir/test_viml.vim b/src/testdir/test_viml.vim index 6c755bb53..0120d2121 100644 --- a/src/testdir/test_viml.vim +++ b/src/testdir/test_viml.vim @@ -1028,6 +1028,30 @@ func Test_type() 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 " vim: ts=8 sw=4 tw=80 fdm=marker " vim: fdt=substitute(substitute(foldtext(),\ '\\%(^+--\\)\\@<=\\(\\s*\\)\\(.\\{-}\\)\:\ \\%(\"\ \\)\\=\\(Test\ \\d*\\)\:\\s*',\ '\\3\ (\\2)\:\ \\1',\ \"\"),\ '\\(Test\\s*\\)\\(\\d\\)\\D\\@=',\ '\\1\ \\2',\ "") diff --git a/src/version.c b/src/version.c index c6e724470..f95be69e5 100644 --- a/src/version.c +++ b/src/version.c @@ -748,6 +748,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1281, +/**/ 1280, /**/ 1279, |