thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.2-108

Browse Source
This commit is contained in:
Bram Moolenaar
2009-02-11 21:48:40 +00:00
parent 8de49e183d
commit f69d9a354b
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/option.c
View File

@@ -4127,6 +4127,7 @@ do_set(arg, opt_flags)
errmsg = (char_u *)_("E520: Not allowed in a modeline"); errmsg = (char_u *)_("E520: Not allowed in a modeline");
goto skip; goto skip;
} }
#ifdef FEAT_DIFF
/* In diff mode some options are overruled. This avoids that /* In diff mode some options are overruled. This avoids that
* 'foldmethod' becomes "marker" instead of "diff" and that * 'foldmethod' becomes "marker" instead of "diff" and that
* "wrap" gets set. */ * "wrap" gets set. */
@@ -4134,6 +4135,7 @@ do_set(arg, opt_flags)
&& (options[opt_idx].indir == PV_FDM && (options[opt_idx].indir == PV_FDM
|| options[opt_idx].indir == PV_WRAP)) || options[opt_idx].indir == PV_WRAP))
goto skip; goto skip;
#endif
} }
#ifdef HAVE_SANDBOX #ifdef HAVE_SANDBOX

2
src/version.c
View File

@@ -676,6 +676,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
108,
/**/ /**/
107, 107,
/**/ /**/