From 5d0183b706c618bf043380f7e995987cde9e7d56 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 11 May 2019 21:38:58 +0200 Subject: [PATCH] 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 | 15 +++++++++++++-- src/version.c | 2 ++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/term.c b/src/term.c index 29d402505..fb002ec81 100644 --- a/src/term.c +++ b/src/term.c @@ -2108,8 +2108,9 @@ set_termname(char_u *term) # 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 @@ -2149,6 +2150,11 @@ set_mouse_termcode( if (n == KS_URXVT_MOUSE) 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; @@ -2196,6 +2202,11 @@ del_mouse_termcode( if (n == KS_URXVT_MOUSE) 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; diff --git a/src/version.c b/src/version.c index 2c49841ed..f41ca6132 100644 --- a/src/version.c +++ b/src/version.c @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1323, /**/ 1322, /**/ -- 2.40.0