summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-11-04 22:08:29 +0100
committerBram Moolenaar <Bram@vim.org>2016-11-04 22:08:29 +0100
commitaab3383e70456f054fe9d0963fe3eb45994aa5e7 (patch)
tree5409c989a767af3c14771d0a618b8818e267ed5f
parent426f3754223c8ff8a1bc51d6ba1eba11e8982ebc (diff)
patch 8.0.0061v8.0.0061
Problem: Compiler warning for unused variable. Solution: Add #ifdef. (John Marriott)
-rw-r--r--src/popupmnu.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/popupmnu.c b/src/popupmnu.c
index 6a75686ff8..19d215b9f5 100644
--- a/src/popupmnu.c
+++ b/src/popupmnu.c
@@ -60,7 +60,9 @@ pum_display(
int above_row;
int below_row;
int redo_count = 0;
+#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
win_T *pvwin;
+#endif
redo:
def_width = PUM_DEF_WIDTH;
diff --git a/src/version.c b/src/version.c
index b567665883..ab005b75ac 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 61,
+/**/
60,
/**/
59,