commit f2f70252d1d232e85008852a5331351ed0426b49
author Bram Moolenaar <Bram@vim.org> Wed Feb 13 17:36:06 2008 +0000
committer Bram Moolenaar <Bram@vim.org> Wed Feb 13 17:36:06 2008 +0000
tree f357a928da93fe2a2701bfba6e5d2ebf5af542c3
parent e3300c8887bf78f056c44b6f0c55008182f4e2d4

updated for version 7.1-250

src/option.c

diff --git a/src/option.c b/src/option.c
index 6ff0a21..1d2f2aa 100644
--- a/src/option.c
+++ b/src/option.c
@@ -5671,7 +5671,7 @@
     {
 	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

src/version.c

diff --git a/src/version.c b/src/version.c
index 3d222f2..979bb40 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    250,
+/**/
     249,
 /**/
     248,