Mercurial > vim
changeset 17492:523591cf1b70 v8.1.1744
patch 8.1.1744: build error without the conceal feature
commit https://github.com/vim/vim/commit/07d1356648a2a9b5f07e20ff1d3c4c606ae45d49
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Jul 24 18:43:08 2019 +0200
patch 8.1.1744: build error without the conceal feature
Problem: Build error without the conceal feature.
Solution: Define variables also without the conceal feature.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 24 Jul 2019 18:45:06 +0200 |
| parents | f8214f779ae6 |
| children | 7f993d962a1d |
| files | src/screen.c src/version.c |
| diffstat | 2 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/screen.c +++ b/src/screen.c @@ -3315,17 +3315,17 @@ win_line( #endif int screen_line_flags = 0; + int match_conc = 0; // cchar for match functions #ifdef FEAT_CONCEAL int syntax_flags = 0; int syntax_seqnr = 0; int prev_syntax_id = 0; int conceal_attr = HL_ATTR(HLF_CONCEAL); int is_concealing = FALSE; - int boguscols = 0; /* nonexistent columns added to force - wrapping */ - int vcol_off = 0; /* offset for concealed characters */ + int boguscols = 0; // nonexistent columns added to force + // wrapping + int vcol_off = 0; // offset for concealed characters int did_wcol = FALSE; - int match_conc = 0; /* cchar for match functions */ int old_boguscols = 0; # define VCOL_HLC (vcol - vcol_off) # define FIX_FOR_BOGUSCOLS \ @@ -3859,8 +3859,8 @@ win_line( */ for (;;) { + int has_match_conc = 0; // match wants to conceal #ifdef FEAT_CONCEAL - int has_match_conc = 0; // match wants to conceal int did_decrement_ptr = FALSE; #endif /* Skip this quickly when working on the text. */