updated for version 7.1-314

diff --git a/src/option.c b/src/option.c
index c432869749b7a073c3317ec1b7de2c0a3730919f..885c547b63f80a646223d2668333da7d4f7bc95d 100644 (file)
--- 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 79bd67d6dddb95f5b753dcba255a1e738e2fdbc1..61a8944f8c548678dcd692070ec2c333c78fd027 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    314,
 /**/
     313,
 /**/