diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-03-08 20:58:29 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-03-08 20:58:29 +0100 |
commit | 0622732b32ff4a883e4f490a1b38ada539da8ba2 (patch) | |
tree | cc98fc11663ee7719304c9526930c5b9526282e0 | |
parent | 6ff02c96519946716069f05c62849986a706033b (diff) | |
download | vim-git-0622732b32ff4a883e4f490a1b38ada539da8ba2.tar.gz |
patch 7.4.1523v7.4.1523
Problem: Writing channel to a file fails on MS-Windows.
Solution: Disable it for now.
-rw-r--r-- | src/testdir/test_channel.vim | 12 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index 7b531c8f0..3b15568f2 100644 --- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -550,6 +550,10 @@ func Test_nl_write_out_file() if !has('job') return endif + " TODO: make this work for MS-Windows + if !has('unix') + return + endif call ch_log('Test_nl_write_out_file()') let job = job_start(s:python . " test_channel_pipe.py", \ {'out-io': 'file', 'out-name': 'Xoutput'}) @@ -571,6 +575,10 @@ func Test_nl_write_err_file() if !has('job') return endif + " TODO: make this work for MS-Windows + if !has('unix') + return + endif call ch_log('Test_nl_write_err_file()') let job = job_start(s:python . " test_channel_pipe.py", \ {'err-io': 'file', 'err-name': 'Xoutput'}) @@ -592,6 +600,10 @@ func Test_nl_write_both_file() if !has('job') return endif + " TODO: make this work for MS-Windows + if !has('unix') + return + endif call ch_log('Test_nl_write_both_file()') let job = job_start(s:python . " test_channel_pipe.py", \ {'out-io': 'file', 'out-name': 'Xoutput', 'err-io': 'out'}) diff --git a/src/version.c b/src/version.c index 0c0e5bd0b..dffa9f0fd 100644 --- a/src/version.c +++ b/src/version.c @@ -744,6 +744,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1523, +/**/ 1522, /**/ 1521, |