summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-04-21 22:23:15 +0200
committerBram Moolenaar <Bram@vim.org>2020-04-21 22:23:15 +0200
commite770598f31ad88fc98e40ead4b228ebc04afaa5d (patch)
tree8509128531d190dd2645e40cb892961ee8acbe83
parentad48e6c1590842ab6d48e6caba3e9250734dae27 (diff)
patch 8.2.0616: build error when disabling the diff featurev8.2.0616
Problem: Build error when disabling the diff feature. Solution: Move parenthesis outside of #ifdef. (Tom Ryder)
-rw-r--r--src/drawline.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/drawline.c b/src/drawline.c
index 1544dae284..8de307aa6e 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 4662de6106..f8eccbfb43 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 616,
+/**/
615,
/**/
614,