summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2007-10-02 18:40:57 +0000
committerBram Moolenaar <Bram@vim.org>2007-10-02 18:40:57 +0000
commit893de92ede66e8edbc9bbb47a8a1b664d5262e75 (patch)
tree253313cd7454ef14f101f1ed694e6a2718633dfa
parentfecb6605787c62acbc0451e3f141357659458145 (diff)
downloadvim-git-893de92ede66e8edbc9bbb47a8a1b664d5262e75.tar.gz
updated for version 7.1-131v7.1.131
-rw-r--r--src/option.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/option.c b/src/option.c
index a8aded520..d0fc1b209 100644
--- a/src/option.c
+++ b/src/option.c
@@ -8753,6 +8753,8 @@ put_setbool(fd, cmd, name, value)
char *name;
int value;
{
+ if (value < 0) /* global/local option using global value */
+ return OK;
if (fprintf(fd, "%s %s%s", cmd, value ? "" : "no", name) < 0
|| put_eol(fd) < 0)
return FAIL;
diff --git a/src/version.c b/src/version.c
index 0f960a732..a8de5b3f1 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 */
/**/
+ 131,
+/**/
130,
/**/
129,