aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-01 04:54:07 -04:00
Code Activity

updated for version 7.1-250

Browse Source
This commit is contained in:
Bram Moolenaar
2008-02-13 17:36:06 +00:00
parent e3300c8887
commit f2f70252d1
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/option.c
View File

@@ -5671,7 +5671,7 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
{ {
if (gvarp == &p_fenc) if (gvarp == &p_fenc)
{ {
if (!curbuf->b_p_ma) if (!curbuf->b_p_ma && opt_flags != OPT_GLOBAL)
errmsg = e_modifiable; errmsg = e_modifiable;
else if (vim_strchr(*varp, ',') != NULL) else if (vim_strchr(*varp, ',') != NULL)
/* No comma allowed in 'fileencoding'; catches confusing it /* No comma allowed in 'fileencoding'; catches confusing it

2
src/version.c
View File

@@ -666,6 +666,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 */
/**/
250,
/**/ /**/
249, 249,
/**/ /**/