aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-25 10:54:51 -04:00
Code

patch 8.0.1407: GUI: CursorHold may trigger before 'updatetime'

Browse Source 
Problem:    GUI: CursorHold may trigger before 'updatetime' when using timers.
Solution:   Check that 'updatetime' has passed.
This commit is contained in:
Bram Moolenaar 2017-12-19 10:02:43 +01:00
parent b254af312d
commit 4af031dbc8
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui.c
View File

@ -2923,6 +2923,9 @@ gui_wait_for_chars_or_timer(long wtime)
gui_wait_for_chars(long wtime, int tb_change_cnt) gui_wait_for_chars(long wtime, int tb_change_cnt)
{ {
int retval; int retval;
#if defined(ELAPSED_FUNC) && defined(FEAT_AUTOCMD)
ELAPSED_TYPE start_tv;
#endif
#ifdef FEAT_MENU #ifdef FEAT_MENU
/* /*
@ -2952,6 +2955,10 @@ gui_wait_for_chars(long wtime, int tb_change_cnt)
return retval; return retval;
} }
#if defined(ELAPSED_FUNC) && defined(FEAT_AUTOCMD)
ELAPSED_INIT(start_tv);
#endif
/* /*
* While we are waiting indefinitely for a character, blink the cursor. * While we are waiting indefinitely for a character, blink the cursor.
*/ */
@ -2966,7 +2973,11 @@ gui_wait_for_chars(long wtime, int tb_change_cnt)
if (gui_wait_for_chars_or_timer(p_ut) == OK) if (gui_wait_for_chars_or_timer(p_ut) == OK)
retval = OK; retval = OK;
#ifdef FEAT_AUTOCMD #ifdef FEAT_AUTOCMD
else if (trigger_cursorhold() && typebuf.tb_change_cnt == tb_change_cnt) else if (trigger_cursorhold()
# ifdef ELAPSED_FUNC
&& ELAPSED_FUNC(start_tv) >= p_ut
# endif
&& typebuf.tb_change_cnt == tb_change_cnt)
{ {
char_u buf[3]; char_u buf[3];

2
src/version.c
View File

@ -771,6 +771,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1407,
/**/ /**/
1406, 1406,
/**/ /**/