Mercurial > vim

comparison src/drawline.c @ 26374:59f2b11ad1be v8.2.3718

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3718: compiler warns for unused variable without +textprop Commit: https://github.com/vim/vim/commit/3569c0de67bc9c723621297ae827d5e3353793a1 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Dec 2 11:34:21 2021 +0000 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.
author Bram Moolenaar <Bram@vim.org>
date Thu, 02 Dec 2021 12:45:03 +0100
parents 13cce5c82c9a
children e624b4ddbdf0
comparison
equal deleted inserted replaced
26373:a9d498b069f3 26374:59f2b11ad1be
263 char_u *p_extra = NULL; // string of extra chars, plus NUL 263 char_u *p_extra = NULL; // string of extra chars, plus NUL
264 char_u *p_extra_free = NULL; // p_extra needs to be freed 264 char_u *p_extra_free = NULL; // p_extra needs to be freed
265 int c_extra = NUL; // extra chars, all the same 265 int c_extra = NUL; // extra chars, all the same
266 int c_final = NUL; // final char, mandatory if set 266 int c_final = NUL; // final char, mandatory if set
267 int extra_attr = 0; // attributes when n_extra != 0 267 int extra_attr = 0; // attributes when n_extra != 0
268 #ifdef FEAT_LINEBREAK 268 #if defined(FEAT_LINEBREAK) && defined(FEAT_PROP_POPUP)
269 int in_linebreak = FALSE; // n_extra set for showing linebreak 269 int in_linebreak = FALSE; // n_extra set for showing linebreak
270 #endif 270 #endif
271 static char_u *at_end_str = (char_u *)""; // used for p_extra when 271 static char_u *at_end_str = (char_u *)""; // used for p_extra when
272 // displaying eol at end-of-line 272 // displaying eol at end-of-line
273 int lcs_eol_one = wp->w_lcs_chars.eol; // eol until it's been used 273 int lcs_eol_one = wp->w_lcs_chars.eol; // eol until it's been used
274 int lcs_prec_todo = wp->w_lcs_chars.prec; // prec until it's been used 274 int lcs_prec_todo = wp->w_lcs_chars.prec;
275 // prec until it's been used
275 276
276 // saved "extra" items for when draw_state becomes WL_LINE (again) 277 // saved "extra" items for when draw_state becomes WL_LINE (again)
277 int saved_n_extra = 0; 278 int saved_n_extra = 0;
278 char_u *saved_p_extra = NULL; 279 char_u *saved_p_extra = NULL;
279 int saved_c_extra = 0; 280 int saved_c_extra = 0;
1715 } 1716 }
1716 } 1717 }
1717 ++p_extra; 1718 ++p_extra;
1718 } 1719 }
1719 --n_extra; 1720 --n_extra;
1720 #ifdef FEAT_LINEBREAK 1721 #if defined(FEAT_LINEBREAK) && defined(FEAT_PROP_POPUP)
1721 if (n_extra <= 0) 1722 if (n_extra <= 0)
1722 in_linebreak = FALSE; 1723 in_linebreak = FALSE;
1723 #endif 1724 #endif
1724 } 1725 }
1725 else 1726 else
2044 - vcol % (int)wp->w_buffer->b_p_ts - 1; 2045 - vcol % (int)wp->w_buffer->b_p_ts - 1;
2045 # endif 2046 # endif
2046 2047
2047 c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' '; 2048 c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' ';
2048 c_final = NUL; 2049 c_final = NUL;
2050 # if defined(FEAT_PROP_POPUP)
2049 if (n_extra > 0 && c != TAB) 2051 if (n_extra > 0 && c != TAB)
2050 in_linebreak = TRUE; 2052 in_linebreak = TRUE;
2053 # endif
2051 if (VIM_ISWHITE(c)) 2054 if (VIM_ISWHITE(c))
2052 { 2055 {
2053 # ifdef FEAT_CONCEAL 2056 # ifdef FEAT_CONCEAL
2054 if (c == TAB) 2057 if (c == TAB)
2055 // See "Tab alignment" below. 2058 // See "Tab alignment" below.