# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1563986706 -7200
# Node ID 523591cf1b70522b9af386ee8f1656782b7e0e93
# Parent  f8214f779ae634b454b7ab676a3f8b5d16b9cdcd
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.

diff --git a/src/screen.c b/src/screen.c
--- 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. */
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1744,
+/**/
     1743,
 /**/
     1742,