summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-07-19 23:06:05 +0200
committerBram Moolenaar <Bram@vim.org>2020-07-19 23:06:05 +0200
commitb146e01a7e41bf5787a2b5ccc6c340ed6001f308 (patch)
tree7c3437e3b0f1f29c26ccf1926953085cc7f2b578
parent54c3fcd852f9d986f81547429e850b3364f058d6 (diff)
patch 8.2.1253: CTRL-K in Insert mode gets <CursorHold> insertedv8.2.1253
Problem: CTRL-K in Insert mode gets <CursorHold> inserted. (Roland Puntaier) Solution: Do not reset did_cursorhold, restore it. (closes #6447)
-rw-r--r--src/normal.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/normal.c b/src/normal.c
index ae2c1f5e32..4a86e7560f 100644
--- 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 89fd043453..daec76500d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1253,
+/**/
1252,
/**/
1251,