diff options
| author | vimboss <devnull@localhost> | 2009-02-11 15:47:05 +0000 |
|---|---|---|
| committer | vimboss <devnull@localhost> | 2009-02-11 15:47:05 +0000 |
| commit | 8e6a0a78f4f30f743d807ff3915dbb84f95c6ecd (patch) | |
| tree | bb6ff2b650496d413890deffd016cca5478e2289 | |
| parent | 5e7d54e8b565b6698453ca553663f4750d298c47 (diff) | |
| download | vim-8e6a0a78f4f30f743d807ff3915dbb84f95c6ecd.tar.gz | |
| -rw-r--r-- | src/option.c | 18 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 16 insertions, 4 deletions
diff --git a/src/option.c b/src/option.c index dcc11fcf..5c78269d 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 395dafb5..2e5fe3c5 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, |