From ea8c219ca852cc8eaf603b1bf475edf95e2850cf Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 7 Feb 2016 19:27:53 +0100 Subject: [PATCH] patch 7.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. --- src/testdir/test_viml.vim | 24 ++++++++++++++++++++++++ src/version.c | 2 ++ 2 files changed, 26 insertions(+) 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 @@ -1027,6 +1027,30 @@ func Test_type() call ChangeYourMind() 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 diff --git a/src/version.c b/src/version.c index c6e724470..f95be69e5 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1281, /**/ 1280, /**/ -- 2.50.1