diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-04 10:54:34 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-04 10:54:34 +0100 |
| commit | e24692573a266f5060c06dd80bde264092c90dd5 (patch) | |
| tree | 090a3573ceebef3dbf8d0dd023e9cf938cb77fe4 /src | |
| parent | b3e2f00f39d6edafda6e5508a926ebd244997a0f (diff) | |
| download | vim-e24692573a266f5060c06dd80bde264092c90dd5.zip | |
patch 7.4.1257
Problem: Channel test fails in some configurations.
Solution: Add check for the +channel feature.
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test_channel.vim | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
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, |