# HG changeset patch
# User vimboss
# Date 1202924166 0
# Node ID eb0504d00480ca6a7758bfa35d64a09b3d389fca
# Parent  bdfbf8ef447a4fabef09ee9d28eedcf0e6b99e57
updated for version 7.1-250

diff --git a/src/option.c b/src/option.c
--- a/src/option.c
+++ b/src/option.c
@@ -5671,7 +5671,7 @@ did_set_string_option(opt_idx, varp, new
     {
 	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
--- 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,