summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-12-01 19:37:07 +0100
committerBram Moolenaar <Bram@vim.org>2019-12-01 19:37:07 +0100
commitfa5612c7d836eb789e0f8ff4b10461b8640a14b2 (patch)
tree0e4040ebe80a7fd8690e409ba4d416fbfea5e207 /src
parent912bc4a51af0ad947cb39deba2a6fa4ee27af906 (diff)
patch 8.1.2377: GUI: when losing focus a pending operator is executedv8.1.2377
Problem: GUI: when losing focus a pending operator is executed. Solution: Do not execute an operator when getting K_IGNORE. (closes #5300)
Diffstat (limited to 'src')
-rw-r--r--src/normal.c5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/normal.c b/src/normal.c
index 363f539c73..ca2a48c089 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -1099,9 +1099,10 @@ getcount:
old_mapped_len = typebuf_maplen();
/*
- * If an operation is pending, handle it...
+ * If an operation is pending, handle it. But not for K_IGNORE.
*/
- do_pending_operator(&ca, old_col, FALSE);
+ if (ca.cmdchar != K_IGNORE)
+ do_pending_operator(&ca, old_col, FALSE);
/*
* Wait for a moment when a message is displayed that will be overwritten
diff --git a/src/version.c b/src/version.c
index 036a4bd697..4d50222d2e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2377,
+/**/
2376,
/**/
2375,