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 4a86e7560f04acf6182d808ae474033fd42b4e21..dd79a43aac51c41e2e944ddf00141e7a2676b0b8 100644 (file)
--- 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 cc7fbfbfe6652c7ea628fee4ce142d40fb7d1f9f..1aacd3b39b25efb7a8eb5373c8a51675c325f577 100644 (file)
--- 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,
 /**/