diff options
| author | Bram Moolenaar <Bram@vim.org> | 2008-02-13 17:36:06 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2008-02-13 17:36:06 +0000 |
| commit | f2f70252d1d232e85008852a5331351ed0426b49 (patch) | |
| tree | f357a928da93fe2a2701bfba6e5d2ebf5af542c3 /src | |
| parent | e3300c8887bf78f056c44b6f0c55008182f4e2d4 (diff) | |
updated for version 7.1-250v7.1.250
Diffstat (limited to 'src')
| -rw-r--r-- | src/option.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/option.c b/src/option.c index 6ff0a218ab..1d2f2aaf74 100644 --- a/src/option.c +++ b/src/option.c @@ -5671,7 +5671,7 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf, { if (gvarp == &p_fenc) { - if (!curbuf->b_p_ma) + if (!curbuf->b_p_ma && opt_flags != OPT_GLOBAL) errmsg = e_modifiable; else if (vim_strchr(*varp, ',') != NULL) /* No comma allowed in 'fileencoding'; catches confusing it diff --git a/src/version.c b/src/version.c index 3d222f2a3a..979bb4012c 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 250, +/**/ 249, /**/ 248, |