summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-04-23 19:44:30 +0200
committerBram Moolenaar <Bram@vim.org>2014-04-23 19:44:30 +0200
commit163d0da508d1a206e6a6ee7e2a34fa0a583ae16c (patch)
treeace62709d3a1ff5ad49d581fb9a099f7e533ce38
parent2af78a14088a158208eab0853201b8ce07b2ac03 (diff)
downloadvim-git-163d0da508d1a206e6a6ee7e2a34fa0a583ae16c.tar.gz
updated for version 7.4.263v7.4.263
Problem: GCC 4.8 compiler warning for hiding a declaration (Francois Gannaz) Solution: Remove the second declaration.
-rw-r--r--src/eval.c1
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c
index 2d29c92c0..c96a4e4e5 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 4478dd550..0ab6fa608 100644
--- 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,