diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-03-21 23:18:54 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-03-21 23:18:54 +0100 |
| commit | 6a06363861fcc6beca6e06b39385da411ce58633 (patch) | |
| tree | a3349b1d9fcbb14a876b9faff64ae35d2eb4ac1c | |
| parent | 8e08125d3a9afd0b16cd84454ae9ddad0abaaab0 (diff) | |
| download | vim-git-6a06363861fcc6beca6e06b39385da411ce58633.tar.gz | |
patch 7.4.1635v7.4.1635
Problem: Channel test is a bit flaky.
Solution: Remove 'DETACH' if it's there.
| -rw-r--r-- | src/testdir/test_channel.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index 5b554b531..dd40187f7 100644 --- 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 index af13a75e5..75ae6149b 100644 --- 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, |