diff options
| author | Bram Moolenaar <Bram@vim.org> | 2009-02-11 21:48:40 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2009-02-11 21:48:40 +0000 |
| commit | f69d9a354b62ced91e99c0004706bebca7c2d96d (patch) | |
| tree | b214a07be4f964d23be0f32d0b4a1e9f14a249a2 | |
| parent | 8de49e183d4f44c723bff5c1744f1373934b4cca (diff) | |
| download | vim-git-f69d9a354b62ced91e99c0004706bebca7c2d96d.tar.gz | |
updated for version 7.2-108v7.2.108
| -rw-r--r-- | src/option.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/option.c b/src/option.c index 5c78269d8..bd12b8bad 100644 --- 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 04dbca663..7a8378860 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 */ /**/ + 108, +/**/ 107, /**/ 106, |