summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-05-04 21:56:28 +0200
committerBram Moolenaar <Bram@vim.org>2021-05-04 21:56:28 +0200
commit1ad72c8eb601d681c84b47380fc31b6d23602d51 (patch)
treeed43a1e6749aa87f9f8601c77bad5f0d80e19fe7
parent02795104442764cd162c2213c7d942a8ddc0a691 (diff)
patch 8.2.2832: operator cancelled by moving mouse when using popupv8.2.2832
Problem: Operator cancelled by moving mouse when using popup. (Sergey Vlasov) Solution: Do not trigger an operator for a mouse move events. (closes #8176)
-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 a15ae35890..92135c18c3 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -1119,9 +1119,10 @@ getcount:
old_mapped_len = typebuf_maplen();
/*
- * If an operation is pending, handle it. But not for K_IGNORE.
+ * If an operation is pending, handle it. But not for K_IGNORE or
+ * K_MOUSEMOVE.
*/
- if (ca.cmdchar != K_IGNORE)
+ if (ca.cmdchar != K_IGNORE && ca.cmdchar != K_MOUSEMOVE)
do_pending_operator(&ca, old_col, FALSE);
/*
diff --git a/src/version.c b/src/version.c
index d9868ef902..c28a39c64b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2832,
+/**/
2831,
/**/
2830,