# HG changeset patch # User Bram Moolenaar # Date 1587501004 -7200 # Node ID 3b57ed35764eefc27e80f97bb6306c3077f3eed1 # Parent ad1b07e1e8955ada681b3fa5b54c9a49d721deaf patch 8.2.0616: build error when disabling the diff feature Commit: https://github.com/vim/vim/commit/e770598f31ad88fc98e40ead4b228ebc04afaa5d Author: Bram Moolenaar Date: Tue Apr 21 22:23:15 2020 +0200 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 --- 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 --- 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,