diff options
author | Bram Moolenaar <Bram@vim.org> | 2008-06-09 15:07:54 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2008-06-09 15:07:54 +0000 |
commit | 7d96acd66bcb1dcb721715ef988825fc9d6b2f2e (patch) | |
tree | efa04890ce2c985fd2692fdf29b2d3b7d9f47f2c | |
parent | ff064e1698a09afc73643fa160705c8a5ac95234 (diff) |
updated for version 7.1-314v7.1.314
-rw-r--r-- | src/option.c | 5 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/option.c b/src/option.c index c432869749..885c547b63 100644 --- a/src/option.c +++ b/src/option.c @@ -243,7 +243,8 @@ /* WV_ and BV_ values get typecasted to this for the "indir" field */ typedef enum { - PV_NONE = 0 + PV_NONE = 0, + PV_MAXVAL = 0xffff /* to avoid warnings for value out of range */ } idopt_T; /* @@ -8713,7 +8714,7 @@ put_setstring(fd, cmd, name, valuep, expand) { s = *valuep; while (*s != NUL) - if (fputs((char *)str2special(&s, FALSE), fd) < 0) + if (put_escstr(fd, str2special(&s, FALSE), 2) == FAIL) return FAIL; } else if (expand) diff --git a/src/version.c b/src/version.c index 79bd67d6dd..61a8944f8c 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 */ /**/ + 314, +/**/ 313, /**/ 312, |