Mercurial > vim
changeset 1810:5d84650b569c v7.2.108
updated for version 7.2-108
author | vimboss |
---|---|
date | Wed, 11 Feb 2009 21:48:40 +0000 |
parents | e9d018b58830 |
children | d88bdbabfbc6 |
files | src/option.c src/version.c |
diffstat | 2 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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