diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-03-25 20:16:28 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-03-25 20:16:28 +0100 |
| commit | 1572e30607e9a3bee9750242bf37168f7d2b6e66 (patch) | |
| tree | b96a11b9d9d842902c1503947bfcb89fb342d8bf | |
| parent | a683ec44c34f0717dcc6a0c03493ba39b879ac38 (diff) | |
| download | vim-git-1572e30607e9a3bee9750242bf37168f7d2b6e66.tar.gz | |
patch 8.0.0512: check for available characters takes too longv8.0.0512
Problem: Check for available characters takes too long.
Solution: Only check did_start_blocking if wtime is negative. (Daisuke
Suzuki, closes #1591)
| -rw-r--r-- | src/os_unix.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index f0a562172..c78e7bf96 100644 --- 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 7d2cf2758..3ebe8a6f9 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 512, +/**/ 511, /**/ 510, |