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.
diff --git a/src/gui.c b/src/gui.c
index 7026a11..916c9be 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -2923,6 +2923,9 @@
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 @@
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 @@
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];
diff --git a/src/version.c b/src/version.c
index a2336f8..c384ff0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1407,
+/**/
1406,
/**/
1405,