Mercurial > vim

changeset 7945:e72438a11172 v7.4.1268

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Christian Brabandt <cb@256bit.org>
date Sat, 06 Feb 2016 18:30:04 +0100
parents f2d749f1d0ac
children b91049e93f0b
files src/channel.c src/version.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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)
 	{
--- 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,