# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1480771804 -3600
# Node ID f5c7c76897fa89a4ae1469798364f8dfeabf5653
# Parent  15b87f017d8cb3c1086e9f3e2da677df359c3f60
commit https://github.com/vim/vim/commit/5643db84c6a9f15d14492cefd52647623aa2ac7c
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Dec 3 14:29:10 2016 +0100

    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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    120,
+/**/
     119,
 /**/
     118,