patch 8.2.1253: CTRL-K in Insert mode gets <CursorHold> inserted

Problem:    CTRL-K in Insert mode gets <CursorHold> inserted. (Roland
            Puntaier)
Solution:   Do not reset did_cursorhold, restore it. (closes #6447)

diff --git a/src/normal.c b/src/normal.c
index ae2c1f5e324edaaea788917463cc8c338deed764..4a86e7560f04acf6182d808ae474033fd42b4e21 100644 (file)
--- a/src/normal.c
+++ b/src/normal.c
@@ -499,6 +499,7 @@ normal_cmd(
 #ifdef FEAT_EVAL
     int                set_prevcount = FALSE;
 #endif
+    int                save_did_cursorhold = did_cursorhold;
 
     CLEAR_FIELD(ca);   // also resets ca.retval
     ca.oap = oap;
@@ -1025,7 +1026,7 @@ getcount:
        out_flush();
 #endif
     if (ca.cmdchar != K_IGNORE)
-       did_cursorhold = FALSE;
+       did_cursorhold = save_did_cursorhold;
 
     State = NORMAL;
 

diff --git a/src/version.c b/src/version.c
index 89fd043453e47d1019d13002886ce3ebe6a766f2..daec76500d6cd8d413c1908aa9480edb33b97de2 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 */
+/**/
+    1253,
 /**/
     1252,
 /**/