commit 5d0183b706c618bf043380f7e995987cde9e7d56
author Bram Moolenaar <Bram@vim.org> Sat May 11 21:38:58 2019 +0200
committer Bram Moolenaar <Bram@vim.org> Sat May 11 21:38:58 2019 +0200
tree fbbcb7b4a3ec748763cac552903c8ccbf19ee283
parent 6e75e0a400d85cbcc27e2190ff448196bca025a8

patch 8.1.1323: 'mouse' option is reset when using GPM mouse

Problem:    'mouse' option is reset when using GPM mouse.
Solution:   Add flag for GPM mouse.

src/term.c

diff --git a/src/term.c b/src/term.c
index 29d4025..fb002ec 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2108,8 +2108,9 @@
 #  define HMT_JSBTERM	8
 #  define HMT_PTERM	16
 #  define HMT_URXVT	32
-#  define HMT_SGR	64
-#  define HMT_SGR_REL	128
+#  define HMT_GPM	64
+#  define HMT_SGR	128
+#  define HMT_SGR_REL	256
 static int has_mouse_termcode = 0;
 # endif
 
@@ -2150,6 +2151,11 @@
 	has_mouse_termcode |= HMT_URXVT;
     else
 #   endif
+#   ifdef FEAT_MOUSE_GPM
+    if (n == KS_GPM_MOUSE)
+	has_mouse_termcode |= HMT_GPM;
+    else
+#   endif
     if (n == KS_SGR_MOUSE)
 	has_mouse_termcode |= HMT_SGR;
     else if (n == KS_SGR_MOUSE_RELEASE)
@@ -2197,6 +2203,11 @@
 	has_mouse_termcode &= ~HMT_URXVT;
     else
 #   endif
+#   ifdef FEAT_MOUSE_GPM
+    if (n == KS_GPM_MOUSE)
+	has_mouse_termcode &= ~HMT_GPM;
+    else
+#   endif
     if (n == KS_SGR_MOUSE)
 	has_mouse_termcode &= ~HMT_SGR;
     else if (n == KS_SGR_MOUSE_RELEASE)

src/version.c

diff --git a/src/version.c b/src/version.c
index 2c49841..f41ca61 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1323,
+/**/
     1322,
 /**/
     1321,