aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.1896: compiler warning for unused variable

Browse Source 
Problem:    Compiler warning for unused variable.
Solution:   Add #ifdef. (John Marriott)  Missing part of 8.1.1892.
This commit is contained in:
Bram Moolenaar 2019-08-20 23:14:15 +02:00
parent 6f10c70b59
commit eaf3524119
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/popupmnu.c
View File

@ -638,7 +638,9 @@ pum_set_selected(int n, int repeat)
{ {
int resized = FALSE; int resized = FALSE;
int context = pum_height / 2; int context = pum_height / 2;
#ifdef FEAT_QUICKFIX
int prev_selected = pum_selected; int prev_selected = pum_selected;
#endif
#ifdef FEAT_TEXT_PROP #ifdef FEAT_TEXT_PROP
int has_info = FALSE; int has_info = FALSE;
#endif #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)) if (WIN_IS_POPUP(curwin))
// can't keep focus in a popup window // can't keep focus in a popup window
win_enter(firstwin, TRUE); win_enter(firstwin, TRUE);
@ -900,7 +902,7 @@ pum_set_selected(int n, int repeat)
} }
#endif #endif
} }
# ifdef FEAT_TEXT_PROP # if defined(FEAT_TEXT_PROP) && defined(FEAT_QUICKFIX)
if (!has_info) if (!has_info)
// close any popup info window // close any popup info window
popup_close_preview(TRUE); popup_close_preview(TRUE);
@ -922,7 +924,7 @@ pum_undisplay(void)
redraw_all_later(NOT_VALID); redraw_all_later(NOT_VALID);
redraw_tabline = TRUE; redraw_tabline = TRUE;
status_redraw_all(); status_redraw_all();
#ifdef FEAT_TEXT_PROP # if defined(FEAT_TEXT_PROP) && defined(FEAT_QUICKFIX)
// close any popup info window // close any popup info window
popup_close_preview(TRUE); popup_close_preview(TRUE);
#endif #endif

2
src/version.c
View File

@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1896,
/**/ /**/
1895, 1895,
/**/ /**/