diff --git a/src/feature.h b/src/feature.h index bcfc4a40c0..703a72fc9e 100644 --- a/src/feature.h +++ b/src/feature.h @@ -1015,12 +1015,6 @@ * +tgetent */ -/* - * The Netbeans feature requires +eval. - */ -#if !defined(FEAT_EVAL) && defined(FEAT_NETBEANS_INTG) -# undef FEAT_NETBEANS_INTG -#endif /* * The +channel feature requires +eval. @@ -1029,6 +1023,13 @@ # undef FEAT_JOB_CHANNEL #endif +/* + * The Netbeans feature requires +eval and +job_channel + */ +#if (!defined(FEAT_EVAL) || !defined(FEAT_JOB_CHANNEL)) && defined(FEAT_NETBEANS_INTG) +# undef FEAT_NETBEANS_INTG +#endif + /* * +terminal ":terminal" command. Runs a terminal in a window. * requires +channel diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim index 7d65cb61eb..7a3a1864d3 100644 --- a/src/testdir/test_vim9_builtin.vim +++ b/src/testdir/test_vim9_builtin.vim @@ -1648,6 +1648,7 @@ def Test_foldtextresult() enddef def Test_foreach() + CheckFeature job v9.CheckSourceDefAndScriptFailure(['foreach(test_null_job(), "")'], ['E1013: Argument 1: type mismatch, expected list but got job', 'E1251: List, Tuple, Dictionary, Blob or String required for argument 1']) enddef diff --git a/src/testdir/test_vimscript.vim b/src/testdir/test_vimscript.vim index 5c88ec6237..16dd70c9d2 100644 --- a/src/testdir/test_vimscript.vim +++ b/src/testdir/test_vimscript.vim @@ -7521,6 +7521,7 @@ endfunc " Test for 'for' loop failures func Test_for_loop_failure() + CheckFeature job func ForFn() for x in test_null_job() endfor diff --git a/src/version.c b/src/version.c index a900afc7b1..bab345d6df 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1282, /**/ 1281, /**/