From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 19 Dec 2017 09:02:43 +0000 (+0100)
Subject: patch 8.0.1407: GUI: CursorHold may trigger before 'updatetime'
X-Git-Tag: v8.0.1407
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4af031dbc8d62f89c94072a406f6d2ec0e5200be;p=vim

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 7026a11d0..916c9befc 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -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];
 
diff --git a/src/version.c b/src/version.c
index a2336f8b1..c384ff008 100644
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1407,
 /**/
     1406,
 /**/