# HG changeset patch # User Bram Moolenaar # Date 1566335703 -7200 # Node ID 87c5c07a4cac724cace6c2c86a6d5bcd5698355d # Parent 00065638b5fd5980a50e9751718b81bbdffe7f7a patch 8.1.1896: compiler warning for unused variable commit https://github.com/vim/vim/commit/eaf35241197fc6b9ee9af993095bf5e6f35c8f1a Author: Bram Moolenaar Date: Tue Aug 20 23:14:15 2019 +0200 patch 8.1.1896: compiler warning for unused variable Problem: Compiler warning for unused variable. Solution: Add #ifdef. (John Marriott) Missing part of 8.1.1892. diff --git a/src/popupmnu.c b/src/popupmnu.c --- a/src/popupmnu.c +++ b/src/popupmnu.c @@ -638,7 +638,9 @@ pum_set_selected(int n, int repeat) { int resized = FALSE; int context = pum_height / 2; +#ifdef FEAT_QUICKFIX int prev_selected = pum_selected; +#endif #ifdef FEAT_TEXT_PROP int has_info = FALSE; #endif @@ -892,7 +894,7 @@ pum_set_selected(int n, int repeat) } } } -# ifdef FEAT_TEXT_PROP +# if defined(FEAT_TEXT_PROP) && defined(FEAT_QUICKFIX) if (WIN_IS_POPUP(curwin)) // can't keep focus in a popup window win_enter(firstwin, TRUE); @@ -900,7 +902,7 @@ pum_set_selected(int n, int repeat) } #endif } -# ifdef FEAT_TEXT_PROP +# if defined(FEAT_TEXT_PROP) && defined(FEAT_QUICKFIX) if (!has_info) // close any popup info window popup_close_preview(TRUE); @@ -922,7 +924,7 @@ pum_undisplay(void) redraw_all_later(NOT_VALID); redraw_tabline = TRUE; status_redraw_all(); -#ifdef FEAT_TEXT_PROP +# if defined(FEAT_TEXT_PROP) && defined(FEAT_QUICKFIX) // close any popup info window popup_close_preview(TRUE); #endif diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -766,6 +766,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1896, +/**/ 1895, /**/ 1894,