# HG changeset patch # User Christian Brabandt # Date 1458599404 -3600 # Node ID 683b3702970adff4c13d818c78feaab34c8cd2a8 # Parent 10294afbbce07cef1fc187b05b438a2166afa9ae commit https://github.com/vim/vim/commit/6a06363861fcc6beca6e06b39385da411ce58633 Author: Bram Moolenaar Date: Mon Mar 21 23:18:54 2016 +0100 patch 7.4.1635 Problem: Channel test is a bit flaky. Solution: Remove 'DETACH' if it's there. 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 @@ -685,6 +685,9 @@ func Run_test_pipe_to_buffer(use_name) call ch_sendraw(handle, "quit\n") sp pipe-output call s:waitFor('line("$") >= 6') + if getline('$') == 'DETACH' + $del + endif call assert_equal([firstline, 'line one', 'line two', 'this', 'AND this', 'Goodbye!'], getline(1, '$')) bwipe! finally diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1635, +/**/ 1634, /**/ 1633,