Mercurial > vim

changeset 8692:683b3702970a v7.4.1635

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/6a06363861fcc6beca6e06b39385da411ce58633 Author: Bram Moolenaar <Bram@vim.org> 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.
author Christian Brabandt <cb@256bit.org>
date Mon, 21 Mar 2016 23:30:04 +0100
parents 10294afbbce0
children 118a0378ccd3
files src/testdir/test_channel.vim src/version.c
diffstat 2 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,