# HG changeset patch # User Christian Brabandt # Date 1454580004 -3600 # Node ID 14540239601d9a40d2ef8fe0f651f1eec4f391a2 # Parent 942b91b6707e0adfb70cd360998d7a8eb4097d8a commit https://github.com/vim/vim/commit/e24692573a266f5060c06dd80bde264092c90dd5 Author: Bram Moolenaar Date: Thu Feb 4 10:54:34 2016 +0100 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 --- 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 --- 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,