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

updated for version 7.2-105

Browse Source
This commit is contained in:
Bram Moolenaar
2009-02-11 15:47:05 +00:00
parent 4352f134ef
commit 1bf0ddcbfe
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/option.c
View File

@@ -4119,12 +4119,22 @@ do_set(arg, opt_flags)
&& options[opt_idx].var == VAR_WIN) && options[opt_idx].var == VAR_WIN)
goto skip; goto skip;
/* Disallow changing some options from modelines */ /* Disallow changing some options from modelines. */
if ((opt_flags & OPT_MODELINE) && (flags & P_SECURE)) if (opt_flags & OPT_MODELINE)
{
if (flags & P_SECURE)
{ {
errmsg = (char_u *)_("E520: Not allowed in a modeline"); errmsg = (char_u *)_("E520: Not allowed in a modeline");
goto skip; 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 #ifdef HAVE_SANDBOX
/* Disallow changing some options in the sandbox */ /* Disallow changing some options in the 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 */
/**/
105,
/**/ /**/
104, 104,
/**/ /**/