Mercurial > vim

changeset 1535:eb0504d00480 v7.1.250

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.1-250
author vimboss
date Wed, 13 Feb 2008 17:36:06 +0000
parents bdfbf8ef447a
children 24b7b3cc4eec
files src/option.c src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,