summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-06-06 12:07:54 +0200
committerBram Moolenaar <Bram@vim.org>2021-06-06 12:07:54 +0200
commitf5bfa8faa7bbe025c10148d37e8b47217a430a3b (patch)
treea1b9dea47200c8f7406113c288c7862074ac7c1a
parent2752360646545a9ae4853d2d5ca91cdb07c14eea (diff)
downloadvim-git-f5bfa8faa7bbe025c10148d37e8b47217a430a3b.tar.gz
patch 8.2.2947: build failure without the channel featurev8.2.2947
Problem: Build failure without the channel feature. Solution: Add back #ifdef. (John Marriott)
-rw-r--r--src/eval.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c
index 1fb1f5e70..d0007bbd3 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -5059,6 +5059,7 @@ echo_string_core(
case VAR_JOB:
case VAR_CHANNEL:
+#ifdef FEAT_JOB_CHANNEL
*tofree = NULL;
r = tv->v_type == VAR_JOB ? job_to_string_buf(tv, numbuf)
: channel_to_string_buf(tv, numbuf);
@@ -5067,6 +5068,7 @@ echo_string_core(
*tofree = string_quote(r, FALSE);
r = *tofree;
}
+#endif
break;
case VAR_INSTR:
diff --git a/src/version.c b/src/version.c
index efb1b4251..7bc2afcec 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2947,
+/**/
2946,
/**/
2945,