summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-06-15 23:10:30 +0200
committerBram Moolenaar <Bram@vim.org>2019-06-15 23:10:30 +0200
commit6c17543b5634ccccedfbffa4993e9fbd4a990067 (patch)
tree6d5bad41d9e9f455a0fb5d494cd86fe7158d6511
parent51c313104096c7af5024aebbf295f7f03486874b (diff)
downloadvim-git-8.1.1551.tar.gz
patch 8.1.1551: warning for shadowing popup_dragwinv8.1.1551
Problem: Warning for shadowing popup_dragwin. (Dominique Pelle) Solution: Add missing change.
-rw-r--r--src/ui.c1
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ui.c b/src/ui.c
index 9e387b4ce..db878e61a 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -2929,7 +2929,6 @@ jump_to_mouse(
#endif
#ifdef FEAT_TEXT_PROP
static int in_popup_win = FALSE;
- static win_T *popup_dragwin = NULL;
#endif
static int prev_row = -1;
static int prev_col = -1;
diff --git a/src/version.c b/src/version.c
index 96670c6fb..b213bda11 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1551,
+/**/
1550,
/**/
1549,