From e24692573a266f5060c06dd80bde264092c90dd5 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 4 Feb 2016 10:54:34 +0100 Subject: [PATCH] patch 7.4.1257 Problem: Channel test fails in some configurations. Solution: Add check for the +channel feature. --- src/testdir/test_channel.vim | 6 +++++- src/version.c | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index 3caf5d21d9..80ccb08237 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 b318dc7101..7192bae1dd 100644 --- 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, /**/