Mercurial > vim
comparison src/os_win32.c @ 8222:4f0677020a43 v7.4.1404
commit https://github.com/vim/vim/commit/9186a276222ea8a7c88f4092ac5b4201381f4e20
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Feb 23 19:34:01 2016 +0100
patch 7.4.1404
Problem: ch_read() doesn't time out on MS-Windows.
Solution: Instead of WM_NETBEANS use select(). (Yukihiro Nakadaira)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 23 Feb 2016 19:45:05 +0100 |
parents | 477c1d855698 |
children | 989ac3aed1ef |
comparison
equal
deleted
inserted
replaced
8221:5def36f799a2 | 8222:4f0677020a43 |
---|---|
1490 } | 1490 } |
1491 if (msec != 0) | 1491 if (msec != 0) |
1492 { | 1492 { |
1493 DWORD dwWaitTime = dwEndTime - dwNow; | 1493 DWORD dwWaitTime = dwEndTime - dwNow; |
1494 | 1494 |
1495 #ifdef FEAT_CHANNEL | |
1496 /* Check channel while waiting input. */ | |
1497 if (dwWaitTime > 100) | |
1498 dwWaitTime = 100; | |
1499 #endif | |
1495 #ifdef FEAT_MZSCHEME | 1500 #ifdef FEAT_MZSCHEME |
1496 if (mzthreads_allowed() && p_mzq > 0 | 1501 if (mzthreads_allowed() && p_mzq > 0 |
1497 && (msec < 0 || (long)dwWaitTime > p_mzq)) | 1502 && (msec < 0 || (long)dwWaitTime > p_mzq)) |
1498 dwWaitTime = p_mzq; /* don't wait longer than 'mzquantum' */ | 1503 dwWaitTime = p_mzq; /* don't wait longer than 'mzquantum' */ |
1499 #endif | 1504 #endif |