Mercurial > vim

comparison src/screen.c @ 17492:523591cf1b70 v8.1.1744

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 367ef00c6258
children a31c27cbc0d6
comparison
equal deleted inserted replaced
17491:f8214f779ae6 17492:523591cf1b70
3313 int feedback_col = 0; 3313 int feedback_col = 0;
3314 int feedback_old_attr = -1; 3314 int feedback_old_attr = -1;
3315 #endif 3315 #endif
3316 int screen_line_flags = 0; 3316 int screen_line_flags = 0;
3317 3317
3318 int match_conc = 0; // cchar for match functions
3318 #ifdef FEAT_CONCEAL 3319 #ifdef FEAT_CONCEAL
3319 int syntax_flags = 0; 3320 int syntax_flags = 0;
3320 int syntax_seqnr = 0; 3321 int syntax_seqnr = 0;
3321 int prev_syntax_id = 0; 3322 int prev_syntax_id = 0;
3322 int conceal_attr = HL_ATTR(HLF_CONCEAL); 3323 int conceal_attr = HL_ATTR(HLF_CONCEAL);
3323 int is_concealing = FALSE; 3324 int is_concealing = FALSE;
3324 int boguscols = 0; /* nonexistent columns added to force 3325 int boguscols = 0; // nonexistent columns added to force
3325 wrapping */ 3326 // wrapping
3326 int vcol_off = 0; /* offset for concealed characters */ 3327 int vcol_off = 0; // offset for concealed characters
3327 int did_wcol = FALSE; 3328 int did_wcol = FALSE;
3328 int match_conc = 0; /* cchar for match functions */
3329 int old_boguscols = 0; 3329 int old_boguscols = 0;
3330 # define VCOL_HLC (vcol - vcol_off) 3330 # define VCOL_HLC (vcol - vcol_off)
3331 # define FIX_FOR_BOGUSCOLS \ 3331 # define FIX_FOR_BOGUSCOLS \
3332 { \ 3332 { \
3333 n_extra += vcol_off; \ 3333 n_extra += vcol_off; \
3857 /* 3857 /*
3858 * Repeat for the whole displayed line. 3858 * Repeat for the whole displayed line.
3859 */ 3859 */
3860 for (;;) 3860 for (;;)
3861 { 3861 {
3862 int has_match_conc = 0; // match wants to conceal
3862 #ifdef FEAT_CONCEAL 3863 #ifdef FEAT_CONCEAL
3863 int has_match_conc = 0; // match wants to conceal
3864 int did_decrement_ptr = FALSE; 3864 int did_decrement_ptr = FALSE;
3865 #endif 3865 #endif
3866 /* Skip this quickly when working on the text. */ 3866 /* Skip this quickly when working on the text. */
3867 if (draw_state != WL_LINE) 3867 if (draw_state != WL_LINE)
3868 { 3868 {