patch 8.2.2930: when a popup is visible a mouse move my restart Visual mode
Problem: When a popup is visible a mouse move my restart Visual mode.
Solution: Reset held_button when ending Visual mode. (closes #8318)
diff --git a/src/mouse.c b/src/mouse.c
index 4bff48e..f1c1aab 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -2098,6 +2098,14 @@
(void)do_mouse(cap->oap, cap->cmdchar, BACKWARD, cap->count1, 0);
}
+static int held_button = MOUSE_RELEASE;
+
+ void
+reset_held_button()
+{
+ held_button = MOUSE_RELEASE;
+}
+
/*
* Check if typebuf 'tp' contains a terminal mouse code and returns the
* modifiers found in typebuf in 'modifiers'.
@@ -2123,7 +2131,6 @@
int is_release, release_is_ambiguous;
int wheel_code = 0;
int current_button;
- static int held_button = MOUSE_RELEASE;
static int orig_num_clicks = 1;
static int orig_mouse_code = 0x0;
# ifdef CHECK_DOUBLE_CLICK
diff --git a/src/normal.c b/src/normal.c
index cb496dd..f8ec8e9 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -1380,6 +1380,7 @@
#endif
VIsual_active = FALSE;
+ reset_held_button();
setmouse();
mouse_dragging = 0;
diff --git a/src/proto/mouse.pro b/src/proto/mouse.pro
index f2a8c38..37a2f07 100644
--- a/src/proto/mouse.pro
+++ b/src/proto/mouse.pro
@@ -13,6 +13,7 @@
int jump_to_mouse(int flags, int *inclusive, int which_button);
void nv_mousescroll(cmdarg_T *cap);
void nv_mouse(cmdarg_T *cap);
+void reset_held_button(void);
int check_termcode_mouse(char_u *tp, int *slen, char_u *key_name, char_u *modifiers_start, int idx, int *modifiers);
int mouse_comp_pos(win_T *win, int *rowp, int *colp, linenr_T *lnump, int *plines_cache);
win_T *mouse_find_win(int *rowp, int *colp, mouse_find_T popup);
diff --git a/src/version.c b/src/version.c
index 28907ee..f89a149 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2930,
+/**/
2929,
/**/
2928,