summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/option.c18
-rw-r--r--src/version.c2
2 files changed, 16 insertions, 4 deletions
diff --git a/src/option.c b/src/option.c
index dcc11fcf2..5c78269d8 100644
--- 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 395dafb5d..2e5fe3c57 100644
--- 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 */
/**/
+ 105,
+/**/
104,
/**/
103,