summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/getchar.c5
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/getchar.c b/src/getchar.c
index da8132cbff..5d0c99438f 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -2529,6 +2529,9 @@ handle_mapping(
&& (typebuf.tb_buf[typebuf.tb_off + 1] == KS_MODIFIER
# if defined(MSWIN)
|| (typebuf.tb_len >= 3
+# ifdef FEAT_GUI
+ && !gui.in_use
+# endif
&& typebuf.tb_buf[typebuf.tb_off + 1] == KS_EXTRA
&& (typebuf.tb_buf[typebuf.tb_off + 2] == KE_MOUSEUP
|| typebuf.tb_buf[typebuf.tb_off + 2] == KE_MOUSEDOWN
@@ -2542,7 +2545,7 @@ handle_mapping(
// The GUI code sends CSI KS_MODIFIER {flags}, but mappings expect
// K_SPECIAL KS_MODIFIER {flags}.
// MS-Windows sends mouse scroll events CSI KS_EXTRA {what}, but
- // mappings expect K_SPECIAL KS_EXTRA {what}.
+ // non-GUI mappings expect K_SPECIAL KS_EXTRA {what}.
tb_c1 = K_SPECIAL;
}
#endif
diff --git a/src/version.c b/src/version.c
index 662835ebf8..f8f0c95aca 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 812,
+/**/
811,
/**/
810,