summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_channel.vim6
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 3caf5d21d..80ccb0823 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -1,7 +1,11 @@
" Test for channel functions.
scriptencoding utf-8
-" This requires the Python command to run the test server.
+if !has('channel')
+ finish
+endif
+
+" This test requires the Python command to run the test server.
" This most likely only works on Unix and Windows console.
if has('unix')
" We also need the pkill command to make sure the server can be stopped.
diff --git a/src/version.c b/src/version.c
index b318dc710..7192bae1d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1257,
+/**/
1256,
/**/
1255,