summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/option.c6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/option.c b/src/option.c
index 8f52406022..f38e9c7066 100644
--- a/src/option.c
+++ b/src/option.c
@@ -6154,7 +6154,8 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
{
for (p = *varp; *p != NUL; ++p)
{
- int x2,x3 = -1;
+ int x2 = -1;
+ int x3 = -1;
if (*p != NUL)
p += mb_ptr2len(p);
@@ -6165,8 +6166,7 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
x3 = mb_ptr2char(p);
p += mb_ptr2len(p);
}
- if (x2 != ':' || x2 == -1 || x3 == -1
- || (*p != NUL && *p != ','))
+ if (x2 != ':' || x3 == -1 || (*p != NUL && *p != ','))
{
errmsg = e_invarg;
break;
diff --git a/src/version.c b/src/version.c
index 18fcd020f0..f071eb9621 100644
--- a/src/version.c
+++ b/src/version.c
@@ -726,6 +726,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 771,
+/**/
770,
/**/
769,