diff options
| -rw-r--r-- | src/os_win32.c | 37 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 21 insertions, 18 deletions
diff --git a/src/os_win32.c b/src/os_win32.c index 3ea1fe321..b5a6cceba 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -1576,34 +1576,35 @@ WaitForChar(long msec, int ignore_input) dwWaitTime = p_mzq; /* don't wait longer than 'mzquantum' */ #endif #ifdef FEAT_TIMERS + // When waiting very briefly don't trigger timers. + if (dwWaitTime > 10) { long due_time; - /* When waiting very briefly don't trigger timers. */ - if (dwWaitTime > 10) + // Trigger timers and then get the time in msec until the next + // one is due. Wait up to that time. + due_time = check_due_timer(); + if (typebuf.tb_change_cnt != tb_change_cnt) { - /* Trigger timers and then get the time in msec until the - * next one is due. Wait up to that time. */ - due_time = check_due_timer(); - if (typebuf.tb_change_cnt != tb_change_cnt) - { - /* timer may have used feedkeys() */ - return FALSE; - } - if (due_time > 0 && dwWaitTime > (DWORD)due_time) - dwWaitTime = due_time; + // timer may have used feedkeys(). + return FALSE; } + if (due_time > 0 && dwWaitTime > (DWORD)due_time) + dwWaitTime = due_time; } #endif + if ( #ifdef FEAT_CLIENTSERVER - /* Wait for either an event on the console input or a message in - * the client-server window. */ - if (msg_wait_for_multiple_objects(1, &g_hConIn, FALSE, - dwWaitTime, QS_SENDMESSAGE) != WAIT_OBJECT_0) + // Wait for either an event on the console input or a + // message in the client-server window. + msg_wait_for_multiple_objects(1, &g_hConIn, FALSE, + dwWaitTime, QS_SENDMESSAGE) != WAIT_OBJECT_0 #else - if (wait_for_single_object(g_hConIn, dwWaitTime) != WAIT_OBJECT_0) + wait_for_single_object(g_hConIn, dwWaitTime) + != WAIT_OBJECT_0 #endif - continue; + ) + continue; } cRecords = 0; diff --git a/src/version.c b/src/version.c index 11e4bb682..90f429624 100644 --- a/src/version.c +++ b/src/version.c @@ -792,6 +792,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 784, +/**/ 783, /**/ 782, |