patch 8.0.0512: check for available characters takes too long

Problem:    Check for available characters takes too long.
Solution:   Only check did_start_blocking if wtime is negative. (Daisuke
            Suzuki, closes #1591)

diff --git a/src/os_unix.c b/src/os_unix.c
index f0a56217248f18ee78a8ac960be098a647a144b2..c78e7bf967b77a8064b1502cf8c42c1469b9f154 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -511,7 +511,7 @@ mch_inchar(
                || interrupted
 #endif
                || wait_time > 0
-               || !did_start_blocking)
+               || (wtime < 0 && !did_start_blocking))
            continue;
 
        /* no character available or interrupted */

diff --git a/src/version.c b/src/version.c
index 7d2cf27584f6a0b5115285a9bdbb709c1a8dc9f5..3ebe8a6f9d13a0b7529beef9752a496742f4e16b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    512,
 /**/
     511,
 /**/