updated for version 7.2-105

diff --git a/src/option.c b/src/option.c
index dcc11fcf28a895f2dde1002495aa3e8099daa42b..5c78269d84ef8012820a3d7f9b8beceb7f89e9c4 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -4119,11 +4119,21 @@ do_set(arg, opt_flags)
                                           && options[opt_idx].var == VAR_WIN)
                goto skip;
 
-           /* Disallow changing some options from modelines */
-           if ((opt_flags & OPT_MODELINE) && (flags & P_SECURE))
+           /* Disallow changing some options from modelines. */
+           if (opt_flags & OPT_MODELINE)
            {
-               errmsg = (char_u *)_("E520: Not allowed in a modeline");
-               goto skip;
+               if (flags & P_SECURE)
+               {
+                   errmsg = (char_u *)_("E520: Not allowed in a modeline");
+                   goto skip;
+               }
+               /* In diff mode some options are overruled.  This avoids that
+                * 'foldmethod' becomes "marker" instead of "diff" and that
+                * "wrap" gets set. */
+               if (curwin->w_p_diff
+                       && (options[opt_idx].indir == PV_FDM
+                           || options[opt_idx].indir == PV_WRAP))
+                   goto skip;
            }
 
 #ifdef HAVE_SANDBOX

diff --git a/src/version.c b/src/version.c
index 395dafb5d66261621abbd7d28dbb3342be4ef144..2e5fe3c57b17c996217416432c3a1c3b57cf89f8 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 */
+/**/
+    105,
 /**/
     104,
 /**/