# HG changeset patch # User Bram Moolenaar # Date 1644179402 -3600 # Node ID 9f70df0b296704c0ce785e9fed018dfe603b3a73 # Parent e436b6c8fe11a0e86f377e9efa0f03156c352ef2 patch 8.2.4314: test fails where lines are skipped Commit: https://github.com/vim/vim/commit/8cbf2499179db39a46e700ab04d0b36e22bcc1bb Author: Bram Moolenaar Date: Sun Feb 6 20:28:13 2022 +0000 patch 8.2.4314: test fails where lines are skipped Problem: Test fails where lines are skipped. Solution: Only give an error when not skipping commands. diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -1228,6 +1228,11 @@ def Test_vim9script_fails() assert_fails('vim9script', 'E1038:') v9.CheckDefFailure(['vim9script'], 'E1038:') + + # no error when skipping + if has('nothing') + vim9script + endif enddef def Test_script_var_shadows_function() diff --git a/src/version.c b/src/version.c --- 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 */ /**/ + 4314, +/**/ 4313, /**/ 4312, diff --git a/src/vim9compile.c b/src/vim9compile.c --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -3139,8 +3139,13 @@ compile_def_function( break; case CMD_vim9script: - emsg(_(e_vim9script_can_only_be_used_in_script)); - goto erret; + if (cctx.ctx_skip != SKIP_YES) + { + emsg(_(e_vim9script_can_only_be_used_in_script)); + goto erret; + } + line = (char_u *)""; + break; case CMD_global: if (check_global_and_subst(ea.cmd, p) == FAIL)