patch 7.4.1257

Problem:    Channel test fails in some configurations.
Solution:   Add check for the +channel feature.

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 3caf5d21d933bb37b8ecdca9501f57e1b134e7db..80ccb08237e67e441b5d4382c7d1c095d917d73d 100644 (file)
--- 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 b318dc7101757889e9f5881d3bbb17feb94b0c43..7192bae1ddbe9b82cdbf79e9e376c36916f55414 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1257,
 /**/
     1256,
 /**/