commit f69d9a354b62ced91e99c0004706bebca7c2d96d
author Bram Moolenaar <Bram@vim.org> Wed Feb 11 21:48:40 2009 +0000
committer Bram Moolenaar <Bram@vim.org> Wed Feb 11 21:48:40 2009 +0000
tree b214a07be4f964d23be0f32d0b4a1e9f14a249a2
parent 8de49e183d4f44c723bff5c1744f1373934b4cca

updated for version 7.2-108

src/option.c

diff --git a/src/option.c b/src/option.c
index 5c78269..bd12b8b 100644
--- a/src/option.c
+++ b/src/option.c
@@ -4127,6 +4127,7 @@
 		    errmsg = (char_u *)_("E520: Not allowed in a modeline");
 		    goto skip;
 		}
+#ifdef FEAT_DIFF
 		/* In diff mode some options are overruled.  This avoids that
 		 * 'foldmethod' becomes "marker" instead of "diff" and that
 		 * "wrap" gets set. */
@@ -4134,6 +4135,7 @@
 			&& (options[opt_idx].indir == PV_FDM
 			    || options[opt_idx].indir == PV_WRAP))
 		    goto skip;
+#endif
 	    }
 
 #ifdef HAVE_SANDBOX