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.

diff --git a/src/screen.c b/src/screen.c
index bdc4b47c3648a428027ce74c69f0b125efe48d6f..01d57407877c9bc2cf19e08cc301fe33e9c82d9c 100644 (file)
--- 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 (;;)
     {
-#ifdef FEAT_CONCEAL
        int has_match_conc  = 0;        // match wants to conceal
+#ifdef FEAT_CONCEAL
        int did_decrement_ptr = FALSE;
 #endif
        /* Skip this quickly when working on the text. */

diff --git a/src/version.c b/src/version.c
index 1253846decb1e394ada2c738b4d3e62e372360f1..df0bc83840355a81213cec1e29d36efb055cc910 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1744,
 /**/
     1743,
 /**/