diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-08-20 23:14:15 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-08-20 23:14:15 +0200 |
| commit | eaf35241197fc6b9ee9af993095bf5e6f35c8f1a (patch) | |
| tree | 98255c3888f51816decea142576fe699db285c54 | |
| parent | 6f10c70b59fa4e56aa479345fb0caeaac7429bfb (diff) | |
| download | vim-git-eaf35241197fc6b9ee9af993095bf5e6f35c8f1a.tar.gz | |
patch 8.1.1896: compiler warning for unused variablev8.1.1896
Problem: Compiler warning for unused variable.
Solution: Add #ifdef. (John Marriott) Missing part of 8.1.1892.
| -rw-r--r-- | src/popupmnu.c | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/popupmnu.c b/src/popupmnu.c index 4d84ba843..467d67020 100644 --- 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 index 2b9a0c637..81e0d5a2d 100644 --- 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, |