thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.1118: a couple of conditions are hard to understand

Browse Source 
Problem:    A couple of conditions are hard to understand.
Solution:   Split the conditions into pieces. (Ozaki Kiichi, closes #3879)
This commit is contained in:
Bram Moolenaar
2019-04-04 20:13:09 +02:00
parent 1cd4dc444a
commit 652de23dc7
3 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/getchar.c
View File

@@ -2030,6 +2030,8 @@ vgetorpeek(int advance)
*/
for (;;)
{
long wait_time;
/*
* ui_breakcheck() is slow, don't use it too often when
* inside a mapping. But call it each time for typed
@@ -2828,18 +2830,25 @@ vgetorpeek(int advance)
// that has a <Nop> RHS.
timedout = FALSE;
if (advance)
{
if (typebuf.tb_len == 0
|| !(p_timeout
|| (p_ttimeout && keylen == KEYLEN_PART_KEY)))
// blocking wait
wait_time = -1L;
else if (keylen == KEYLEN_PART_KEY && p_ttm >= 0)
wait_time = p_ttm;
else
wait_time = p_tm;
}
else
wait_time = 0;
wait_tb_len = typebuf.tb_len;
c = inchar(typebuf.tb_buf + typebuf.tb_off + typebuf.tb_len,
typebuf.tb_buflen - typebuf.tb_off - typebuf.tb_len - 1,
!advance
? 0
: ((typebuf.tb_len == 0
|| !(p_timeout || (p_ttimeout
&& keylen == KEYLEN_PART_KEY)))
? -1L
: ((keylen == KEYLEN_PART_KEY && p_ttm >= 0)
? p_ttm
: p_tm)));
wait_time);
#ifdef FEAT_CMDL_INFO
if (i != 0)