updated for version 7.2-108

diff --git a/src/option.c b/src/option.c
index 5c78269d84ef8012820a3d7f9b8beceb7f89e9c4..bd12b8bad22a14778d07f2b46183327a2f8672a8 100644 (file)
--- 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
index 04dbca663b153160e5f1f7cdf5b58f954cfcaf0e..7a83788603464c6792f558711e23467f0de36694 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    108,
 /**/
     107,
 /**/