From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 20 Jul 2020 21:10:56 +0000 (+0200)
Subject: patch 8.2.1258: CursorHold does not work well
X-Git-Tag: v8.2.1258
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=08815a1d0350fbcc007aea5dd1272454c03fab4f;p=vim

patch 8.2.1258: CursorHold does not work well

Problem:    CursorHold does not work well.a (Shane-XB-Qian)
Solution:   Only restore did_cursorhold when using :normal.
---

diff --git a/src/normal.c b/src/normal.c
index 4a86e7560..dd79a43aa 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -1026,7 +1026,12 @@ getcount:
 	out_flush();
 #endif
     if (ca.cmdchar != K_IGNORE)
-	did_cursorhold = save_did_cursorhold;
+    {
+	if (ex_normal_busy)
+	    did_cursorhold = save_did_cursorhold;
+	else
+	    did_cursorhold = FALSE;
+    }
 
     State = NORMAL;
 
diff --git a/src/version.c b/src/version.c
index cc7fbfbfe..1aacd3b39 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1258,
 /**/
     1257,
 /**/