From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 17 Jan 2013 16:37:35 +0000 (+0100)
Subject: updated for version 7.3.771
X-Git-Tag: v7.3.771
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=09365025386ac6af4710517a89fe0c4ed2bc86e4;p=thirdparty%2Fvim.git

updated for version 7.3.771
Problem:    Uninitialized variable. (Yasuhiro Matsumoto)
Solution:   Set x2 to -1.
---

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
@@ -725,6 +725,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    771,
 /**/
     770,
 /**/