From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 10 Aug 2013 10:45:09 +0000 (+0200)
Subject: updated for version 7.4b.022
X-Git-Tag: v7.4b.022
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b7512b79ce62b5dba75eb5768ec5f0d0fddb49ee;p=vim

updated for version 7.4b.022
Problem:    Not waiting for a character when the tick count overflows.
Solution:   Subtract the unsigned numbers and cast to int. (Ken Takata)
---

diff --git a/src/os_win32.c b/src/os_win32.c
index 48cc4c5dc..4013353cf 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -1357,9 +1357,10 @@ WaitForChar(long msec)
 
 	if (msec > 0)
 	{
-	    /* If the specified wait time has passed, return. */
+	    /* If the specified wait time has passed, return.  Beware that
+	     * GetTickCount() may wrap around (overflow). */
 	    dwNow = GetTickCount();
-	    if (dwNow >= dwEndTime)
+	    if ((int)(dwNow - dwEndTime) >= 0)
 		break;
 	}
 	if (msec != 0)
diff --git a/src/version.c b/src/version.c
index 59476e523..f02bf3552 100644
--- a/src/version.c
+++ b/src/version.c
@@ -727,6 +727,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    22,
 /**/
     21,
 /**/