commit a6c07603ca2fa98a4184f5fd5ab021adcf5156b2
author Bram Moolenaar <Bram@vim.org> Sun Mar 05 21:18:27 2017 +0100
committer Bram Moolenaar <Bram@vim.org> Sun Mar 05 21:18:27 2017 +0100
tree fd78ab3e8ea373d8bf6b3f4e398e71f03681fee9
parent f7e894dfb60b6fd8f426aa3da1452803f8de010c

patch 8.0.0425: build errors when building without folding

Problem:    Build errors when building without folding.
Solution:   Add #ifdefs. (John Marriott)

src/option.c

diff --git a/src/option.c b/src/option.c
index d4e760b..b0baf50 100644
--- a/src/option.c
+++ b/src/option.c
@@ -4535,8 +4535,11 @@
 		 * "wrap" gets set. */
 		if (curwin->w_p_diff
 			&& opt_idx >= 0  /* shut up coverity warning */
-			&& (options[opt_idx].indir == PV_FDM
-			    || options[opt_idx].indir == PV_WRAP))
+			&& (
+#ifdef FEAT_FOLDING
+			    options[opt_idx].indir == PV_FDM ||
+#endif
+			    options[opt_idx].indir == PV_WRAP))
 		    goto skip;
 #endif
 	    }