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
index 4d84ba843674f1365495f5bb44e83e5e6759f998..467d67020b4f61a151f40a4bc47649097322ecff 100644 (file)
--- 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 2b9a0c6374bcfe9a39ca5b152b04be9f05fe5532..81e0d5a2da45157dc0dde7780902cdbbcf3a38ef 100644 (file)
--- 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 */
+/**/
+    1896,
 /**/
     1895,
 /**/