Permalink
Browse files

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

Problem:    GUI: CursorHold may trigger before 'updatetime' when using timers.
Solution:   Check that 'updatetime' has passed.
  • Loading branch information...
brammool committed Dec 19, 2017
1 parent b254af3 commit 4af031dbc8d62f89c94072a406f6d2ec0e5200be
Showing with 14 additions and 1 deletion.
  1. +12 −1 src/gui.c
  2. +2 −0 src/version.c
View
@@ -2923,6 +2923,9 @@ gui_wait_for_chars_or_timer(long wtime)
gui_wait_for_chars(long wtime, int tb_change_cnt)
{
int retval;
#if defined(ELAPSED_FUNC) && defined(FEAT_AUTOCMD)
ELAPSED_TYPE start_tv;
#endif
#ifdef FEAT_MENU
/*
@@ -2952,6 +2955,10 @@ gui_wait_for_chars(long wtime, int tb_change_cnt)
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.
*/
@@ -2966,7 +2973,11 @@ gui_wait_for_chars(long wtime, int tb_change_cnt)
if (gui_wait_for_chars_or_timer(p_ut) == OK)
retval = OK;
#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];
View
@@ -771,6 +771,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1407,
/**/
1406,
/**/

0 comments on commit 4af031d

Please sign in to comment.