patch 8.2.2947: build failure without the channel feature

Problem:    Build failure without the channel feature.
Solution:   Add back #ifdef. (John Marriott)

diff --git a/src/eval.c b/src/eval.c
index 1fb1f5e70bc0226d65128b924c828a3bc237e499..d0007bbd3e9684a2d52a0b8f3e3a1670693733f1 100644 (file)
--- 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 efb1b425181273e57aeb1623022cdf3a08bdd382..7bc2afcec872e303d77a83506bb9a94fd3a004a1 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2947,
 /**/
     2946,
 /**/