# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1454880604 -3600
# Node ID d3fed9a639db1ca79f9edf6e758c4cffd6d86c8b
# Parent  f49f393da704bc6ab0761f05a005e3b0bb8fd2cb
commit https://github.com/vim/vim/commit/0fa98e7b85b52c63611b2fe8e370f0aa1c8f6dc9
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Feb 7 22:21:19 2016 +0100

    patch 7.4.1289
    Problem:    Channel test fails on MS-Windows, connect() takes too long.
    Solution:   Adjust the test for MS-Windows using "waittime".

diff --git a/src/channel.c b/src/channel.c
--- a/src/channel.c
+++ b/src/channel.c
@@ -468,7 +468,8 @@ channel_open(char *hostname, int port_in
 #endif
     }
 
-    if (errno == ECONNREFUSED)
+    /* Only retry for netbeans.  TODO: can we use a waittime instead? */
+    if (errno == ECONNREFUSED && close_cb != NULL)
     {
 	sock_close(sd);
 	if ((sd = (sock_T)socket(AF_INET, SOCK_STREAM, 0)) == (sock_T)-1)
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
@@ -196,8 +196,8 @@ func Test_connect_waittime()
     " Oops, port does exists.
     call ch_close(handle)
   else
-    " Failed connection doesn't wait the full time.
+    " Failed connection doesn't wait the full time on Unix.
     let elapsed = reltime(start)
-    call assert_true(reltimefloat(elapsed) < 1.0)
+    call assert_true(reltimefloat(elapsed) < (has('unix') ? 1.0 : 3.0))
   endif
 endfunc
diff --git a/src/version.c b/src/version.c
--- 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 */
 /**/
+    1289,
+/**/
     1288,
 /**/
     1287,