diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-06-04 14:37:22 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-06-04 14:37:22 +0200 |
| commit | 76b6dfe54ba9b85cd9d8e6539205c1679a187961 (patch) | |
| tree | 1ce969f83414476159d023c0e3416dbdca99e5a3 | |
| parent | e30a3d01dc1b6b066748b1d61cced05cf92b3c80 (diff) | |
patch 7.4.1888v7.4.1888
Problem: Wrong computation of remaining wait time in RealWaitForChar()
Solution: Remember the original waiting time.
| -rw-r--r-- | src/os_unix.c | 21 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 18 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 5c30a43584..4b2c99e85e 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -5577,25 +5577,10 @@ RealWaitForChar(int fd, long msec, int *check_for_gpm UNUSED, int *interrupted) /* Remember at what time we started, so that we know how much longer we * should wait after being interrupted. */ # define USE_START_TV + long start_msec = msec; struct timeval start_tv; - if (msec > 0 && ( -# ifdef FEAT_XCLIPBOARD - xterm_Shell != (Widget)0 -# if defined(USE_XSMP) || defined(FEAT_MZSCHEME) - || -# endif -# endif -# ifdef USE_XSMP - xsmp_icefd != -1 -# ifdef FEAT_MZSCHEME - || -# endif -# endif -# ifdef FEAT_MZSCHEME - (mzthreads_allowed() && p_mzq > 0) -# endif - )) + if (msec > 0) gettimeofday(&start_tv, NULL); # endif @@ -5911,7 +5896,7 @@ select_eintr: { # ifdef USE_START_TV /* Compute remaining wait time. */ - msec -= elapsed(&start_tv); + msec = start_msec - elapsed(&start_tv); # else /* Guess we got interrupted halfway. */ msec = msec / 2; diff --git a/src/version.c b/src/version.c index 7ad9e1b707..e18515e117 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1888, +/**/ 1887, /**/ 1886, |