thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.3718: compiler warns for unused variable without +textprop

Browse Source 
Problem:    Compiler warns for unused variable without the +textprop feature.
            (John Marriott)
Solution:   Adjust #ifdefs.
This commit is contained in:
Bram Moolenaar
2021-12-02 11:34:21 +00:00
parent db9ff9ab5d
commit 3569c0de67
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/drawline.c
View File

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

2
src/version.c
View File

@@ -753,6 +753,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 */
/**/
3718,
/**/ /**/
3717, 3717,
/**/ /**/