# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1454779804 -3600
# Node ID e72438a1117239182c307b6780f8a8e7cae16b6c
# Parent  f2d749f1d0ac6f88ab29510e7b14420d612e9875
commit https://github.com/vim/vim/commit/26dfc41335ef47fe765643148ae980be388084ec
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Feb 6 18:18:54 2016 +0100

    patch 7.4.1268
    Problem:    Waittime is used as seconds instead of milliseconds. (Hirohito
                Higashi)
    Solution:   Divide by 1000.

diff --git a/src/channel.c b/src/channel.c
--- a/src/channel.c
+++ b/src/channel.c
@@ -440,8 +440,8 @@ channel_open(char *hostname, int port_in
 	FD_ZERO(&wfds);
 	FD_SET(sd, &rfds);
 	FD_SET(sd, &wfds);
-	tv.tv_sec = waittime;
-	tv.tv_usec = 0;
+	tv.tv_sec = waittime / 1000;
+	tv.tv_usec = (waittime % 1000) * 1000;
 	ret = select((int)sd+1, &rfds, &wfds, NULL, &tv);
 	if (ret < 0)
 	{
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1268,
+/**/
     1267,
 /**/
     1266,