From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 21 Apr 2020 20:23:15 +0000 (+0200)
Subject: patch 8.2.0616: build error when disabling the diff feature
X-Git-Tag: v8.2.0616
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e770598f31ad88fc98e40ead4b228ebc04afaa5d;p=vim

patch 8.2.0616: build error when disabling the diff feature

Problem:    Build error when disabling the diff feature.
Solution:   Move parenthesis outside of #ifdef. (Tom Ryder)
---

diff --git a/src/drawline.c b/src/drawline.c
index 1544dae28..8de307aa6 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -3095,9 +3095,9 @@ win_line(
 #ifdef FEAT_SYN_HL
 	    if (!(cul_screenline
 # ifdef FEAT_DIFF
-			&& diff_hlf == (hlf_T)0)
+			&& diff_hlf == (hlf_T)0
 # endif
-		    )
+		    ))
 		saved_char_attr = char_attr;
 	    else
 #endif
diff --git a/src/version.c b/src/version.c
index 4662de610..f8eccbfb4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    616,
 /**/
     615,
 /**/