diff --git a/src/option.c b/src/option.c
index 8f52406..f38e9c7 100644
--- a/src/option.c
+++ b/src/option.c
@@ -6154,7 +6154,8 @@
 	{
 	    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 @@
 		    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 18fcd02..f071eb9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -726,6 +726,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    771,
+/**/
     770,
 /**/
     769,