From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 23 Apr 2014 17:44:30 +0000 (+0200)
Subject: updated for version 7.4.263
X-Git-Tag: v7.4.263
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=163d0da508d1a206e6a6ee7e2a34fa0a583ae16c;p=thirdparty%2Fvim.git

updated for version 7.4.263
Problem:    GCC 4.8 compiler warning for hiding a declaration (Francois Gannaz)
Solution:   Remove the second declaration.
---

diff --git a/src/eval.c b/src/eval.c
index 2d29c92c04..c96a4e4e50 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -18319,7 +18319,6 @@ get_cmd_output_as_rettv(argvars, rettv, retlist)
 	char_u		*s = NULL;
 	char_u		*start;
 	char_u		*end;
-	char_u		*p;
 	int		i;
 
 	res = get_cmd_output(get_tv_string(&argvars[0]), infile,
diff --git a/src/version.c b/src/version.c
index 4478dd5507..0ab6fa6088 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    263,
 /**/
     262,
 /**/