patch 9.1.1282: Build and test failure without job feature
Commit:
https://github.com/vim/vim/commit/c54a8eb258ddc4dfc79f668a2d0c0a3c16abc8c4
Author: Christian Brabandt <c...@256bit.org>
Date: Sun Apr 6 16:15:10 2025 +0200
patch 9.1.1282: Build and test failure without job feature
Problem: Build and test failure without job feature
(lazypingu)
Solution: Adjust ifdefs, add CheckFeature job to tests
fixes: #17053
closes: #17059
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/src/feature.h b/src/feature.h
index bcfc4a40c..703a72fc9 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 7d65cb61e..7a3a1864d 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<any> 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 5c88ec623..16dd70c9d 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 a900afc7b..bab345d6d 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,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1u1R0e-0047QY-HJ%40256bit.org.
