diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-12-02 11:34:21 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-12-02 11:34:21 +0000 |
| commit | 3569c0de67bc9c723621297ae827d5e3353793a1 (patch) | |
| tree | 0426dc0997ef10d9f6cbff7c147c153668344885 /src | |
| parent | db9ff9ab5d7ce1fcc2c4106e7ad49151a323996c (diff) | |
patch 8.2.3718: compiler warns for unused variable without +textpropv8.2.3718
Problem: Compiler warns for unused variable without the +textprop feature.
(John Marriott)
Solution: Adjust #ifdefs.
Diffstat (limited to 'src')
| -rw-r--r-- | src/drawline.c | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/drawline.c b/src/drawline.c index ae62be8f37..7d6d4fd8aa 100644 --- 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 c5e5f6b351..cf8f945500 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3718, +/**/ 3717, /**/ 3716, |