Mercurial > vim
changeset 15553:df198b298bff v8.1.0784
patch 8.1.0784: messy indent in if statement
commit https://github.com/vim/vim/commit/1f20daa1d784e2d8ae13db5b9c8abbb648dd2a03
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jan 19 21:12:24 2019 +0100
patch 8.1.0784: messy indent in if statement
Problem: Messy indent in if statement.
Solution: Improve structure of if statement. (Ozaki Kiichi, closes https://github.com/vim/vim/issues/3826)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 19 Jan 2019 21:15:05 +0100 |
| parents | 277eef002768 |
| children | 496f146a0836 |
| files | src/os_win32.c src/version.c |
| diffstat | 2 files changed, 22 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- 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) -#endif - continue; + wait_for_single_object(g_hConIn, dwWaitTime) + != WAIT_OBJECT_0 +#endif + ) + continue; } cRecords = 0;