patch 8.0.0120

Problem:    Channel test is still flaky on OS X.
Solution:   Set the drop argument to "never".

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 31c2e501756250853cabf6169b99afa4c3138746..7baac1d677141e2e77de640e101cf0464bb104f8 100644 (file)
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -26,7 +26,10 @@ func Ch_requestHandler(handle, msg)
 endfunc
 
 func Ch_communicate(port)
+  " Avoid dropping messages, since we don't use a callback here.
+  let s:chopt.drop = 'never'
   let handle = ch_open('localhost:' . a:port, s:chopt)
+  unlet s:chopt.drop
   if ch_status(handle) == "fail"
     call assert_false(1, "Can't open channel")
     return

diff --git a/src/version.c b/src/version.c
index eaf4a38b2a2a2fd538cb037d6b1c2e4ef7520030..a20159cdfc8129c9c3ddf22277a8e677cee023c9 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    120,
 /**/
     119,
 /**/