updated for version 7.1-250

diff --git a/src/option.c b/src/option.c
index 6ff0a218ab4fdcfaa693d1c327a2ea3ba1208465..1d2f2aaf74f3d2a2626fbb6689cc2e238ca067e9 100644 (file)
--- 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 3d222f2a3aed1ca755d97a119d48c62c3a30dcee..979bb4012cf67cdc215b86bb9834a2f809a12a28 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    250,
 /**/
     249,
 /**/