changeset 5840:af1bb39774f4 v7.4.263

updated for version 7.4.263 Problem: GCC 4.8 compiler warning for hiding a declaration (Francois Gannaz) Solution: Remove the second declaration.
author Bram Moolenaar <bram@vim.org>
date Wed, 23 Apr 2014 19:44:30 +0200
parents 389658b4112c
children 3201f30b23e1
files src/eval.c src/version.c
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/eval.c
+++ b/src/eval.c
@@ -18319,7 +18319,6 @@ get_cmd_output_as_rettv(argvars, rettv, 
 	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,
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    263,
+/**/
     262,
 /**/
     261,