summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-08-05 15:02:05 +0200
committerBram Moolenaar <Bram@vim.org>2017-08-05 15:02:05 +0200
commit8456ea80502d5e0d86309a0051a0cf48df586ed4 (patch)
treef93d408ba0679eee3bde309ca648d9cc055a1661
parent78712a7733839598fbc4a61d0582893d22e8adf3 (diff)
downloadvim-git-8456ea80502d5e0d86309a0051a0cf48df586ed4.tar.gz
patch 8.0.0865: cannot build with channel but without terminal featurev8.0.0865
Problem: Cannot build with channel but without terminal feature. Solution: Add #ifdef
-rw-r--r--src/channel.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/channel.c b/src/channel.c
index 801e370cc..9d791a905 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -4391,6 +4391,7 @@ get_job_options(typval_T *tv, jobopt_T *opt, int supported)
return FAIL;
}
}
+#ifdef FEAT_TERMINAL
else if (STRCMP(hi->hi_key, "term_name") == 0)
{
if (!(supported & JO2_TERM_NAME))
@@ -4403,6 +4404,7 @@ get_job_options(typval_T *tv, jobopt_T *opt, int supported)
return FAIL;
}
}
+#endif
else if (STRCMP(hi->hi_key, "waittime") == 0)
{
if (!(supported & JO_WAITTIME))
diff --git a/src/version.c b/src/version.c
index 931874096..bbbdbe38f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 865,
+/**/
864,
/**/
863,