aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-28 04:24:06 -04:00
Code Activity

patch 8.1.1744: build error without the conceal feature

Browse Source 
Problem:    Build error without the conceal feature.
Solution:   Define variables also without the conceal feature.
This commit is contained in:
Bram Moolenaar
2019-07-24 18:43:08 +02:00
parent bbca7732e8
commit 07d1356648
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/screen.c
View File

@@ -3315,17 +3315,17 @@ win_line(
#endif #endif
int screen_line_flags = 0; int screen_line_flags = 0;
int match_conc = 0; // cchar for match functions
#ifdef FEAT_CONCEAL #ifdef FEAT_CONCEAL
int syntax_flags = 0; int syntax_flags = 0;
int syntax_seqnr = 0; int syntax_seqnr = 0;
int prev_syntax_id = 0; int prev_syntax_id = 0;
int conceal_attr = HL_ATTR(HLF_CONCEAL); int conceal_attr = HL_ATTR(HLF_CONCEAL);
int is_concealing = FALSE; int is_concealing = FALSE;
int boguscols = 0; /* nonexistent columns added to force int boguscols = 0; // nonexistent columns added to force
wrapping */ // wrapping
int vcol_off = 0; /* offset for concealed characters */ int vcol_off = 0; // offset for concealed characters
int did_wcol = FALSE; int did_wcol = FALSE;
int match_conc = 0; /* cchar for match functions */
int old_boguscols = 0; int old_boguscols = 0;
# define VCOL_HLC (vcol - vcol_off) # define VCOL_HLC (vcol - vcol_off)
# define FIX_FOR_BOGUSCOLS \ # define FIX_FOR_BOGUSCOLS \
@@ -3859,8 +3859,8 @@ win_line(
*/ */
for (;;) for (;;)
{ {
#ifdef FEAT_CONCEAL
int has_match_conc = 0; // match wants to conceal int has_match_conc = 0; // match wants to conceal
#ifdef FEAT_CONCEAL
int did_decrement_ptr = FALSE; int did_decrement_ptr = FALSE;
#endif #endif
/* Skip this quickly when working on the text. */ /* Skip this quickly when working on the text. */

2
src/version.c
View File

@@ -777,6 +777,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 */
/**/
1744,
/**/ /**/
1743, 1743,
/**/ /**/