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
index 5b554b53131ef845d0f19fb5b35ec0977644fee5..dd40187f757161b54fa7d6dc9bfc7674bfd86e42 100644 (file)
--- 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 af13a75e52665b7c764a694b10cc9cee9c3d4bbc..75ae6149b8b26fd6c6ea6dd6a903ad7dda9fb5b2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1635,
 /**/
     1634,
 /**/