patch 8.2.3718: compiler warns for unused variable without +textprop

Problem:    Compiler warns for unused variable without the +textprop feature.
            (John Marriott)
Solution:   Adjust #ifdefs.

diff --git a/src/drawline.c b/src/drawline.c
index ae62be8f374ce624d1b265b2c8ec461db7ad4d4e..7d6d4fd8aa26f7273408fa600733c36d12b7d6f3 100644 (file)
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -265,13 +265,14 @@ win_line(
     int                c_extra = NUL;          // extra chars, all the same
     int                c_final = NUL;          // final char, mandatory if set
     int                extra_attr = 0;         // attributes when n_extra != 0
-#ifdef FEAT_LINEBREAK
+#if defined(FEAT_LINEBREAK) && defined(FEAT_PROP_POPUP)
     int                in_linebreak = FALSE;   // n_extra set for showing linebreak
 #endif
     static char_u *at_end_str = (char_u *)""; // used for p_extra when
                                        // displaying eol at end-of-line
     int                lcs_eol_one = wp->w_lcs_chars.eol; // eol until it's been used
-    int                lcs_prec_todo = wp->w_lcs_chars.prec; // prec until it's been used
+    int                lcs_prec_todo = wp->w_lcs_chars.prec;
+                                       // prec until it's been used
 
     // saved "extra" items for when draw_state becomes WL_LINE (again)
     int                saved_n_extra = 0;
@@ -1717,7 +1718,7 @@ win_line(
                ++p_extra;
            }
            --n_extra;
-#ifdef FEAT_LINEBREAK
+#if defined(FEAT_LINEBREAK) && defined(FEAT_PROP_POPUP)
            if (n_extra <= 0)
                in_linebreak = FALSE;
 #endif
@@ -2046,8 +2047,10 @@ win_line(
 
                    c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' ';
                    c_final = NUL;
+# if defined(FEAT_PROP_POPUP)
                    if (n_extra > 0 && c != TAB)
                        in_linebreak = TRUE;
+# endif
                    if (VIM_ISWHITE(c))
                    {
 # ifdef FEAT_CONCEAL

diff --git a/src/version.c b/src/version.c
index c5e5f6b351b013a8a75907c9d3702615ed90d5b5..cf8f945500553e2808554a8e84972255b852c003 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3718,
 /**/
     3717,
 /**/