# HG changeset patch
# User vimboss
# Date 1234388920 0
# Node ID 5d84650b569c7800de8012d91660441bda95e5c0
# Parent  e9d018b58830d50906a81e1b1ddbb3e2bdd9126a
updated for version 7.2-108

diff --git a/src/option.c b/src/option.c
--- a/src/option.c
+++ b/src/option.c
@@ -4127,6 +4127,7 @@ do_set(arg, opt_flags)
 		    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 @@ do_set(arg, opt_flags)
 			&& (options[opt_idx].indir == PV_FDM
 			    || options[opt_idx].indir == PV_WRAP))
 		    goto skip;
+#endif
 	    }
 
 #ifdef HAVE_SANDBOX
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    108,
+/**/
     107,
 /**/
     106,