patch 7.4.2316

Problem:    Channel sort test is flaky.
Solution:   Add a check the output has been read.

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 251de600c7276798edf39c0b829cb72991497820..4b511118ad781de1cb5a1b1beb561dd174d1a29a 100644 (file)
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -831,6 +831,7 @@ func Run_pipe_through_sort(all, use_buffer)
   call assert_equal("dead", job_status(g:job))
 
   sp sortout
+  call WaitFor('line("$") > 3')
   call assert_equal('Reading from channel output...', getline(1))
   if a:all
     call assert_equal(['aaa', 'bbb', 'ccc', 'ddd', 'eee'], getline(2, 6))

diff --git a/src/version.c b/src/version.c
index 297830f053d9a0992e80c05a29ffce82729def10..04cf59ea87862ea0181fae2f52d6e0ee38c8a643 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2316,
 /**/
     2315,
 /**/