summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-02-11 20:40:55 +0100
committerBram Moolenaar <Bram@vim.org>2012-02-11 20:40:55 +0100
commitc047b9a49f5877766ae9c2dc86c59f4af1498ec1 (patch)
tree1e08675bccb3e5058631bdb084431c9685d15728
parent3fe37d62d1f321f482331b1bb7c701272000d68d (diff)
downloadvim-git-c047b9a49f5877766ae9c2dc86c59f4af1498ec1.tar.gz
updated for version 7.3.435v7.3.435
Problem: Compiler warning for unused variable. Solution: Move the variable inside #ifdef.
-rw-r--r--src/ex_cmds2.c4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index ddfe103b6..92cd73358 100644
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -3400,7 +3400,7 @@ getsourceline(c, cookie, indent)
{
struct source_cookie *sp = (struct source_cookie *)cookie;
char_u *line;
- char_u *p, *s;
+ char_u *p;
#ifdef FEAT_EVAL
/* If breakpoints have been added/deleted need to check for it. */
@@ -3471,6 +3471,8 @@ getsourceline(c, cookie, indent)
#ifdef FEAT_MBYTE
if (line != NULL && sp->conv.vc_type != CONV_NONE)
{
+ char_u *s;
+
/* Convert the encoding of the script line. */
s = string_convert(&sp->conv, line, NULL);
if (s != NULL)
diff --git a/src/version.c b/src/version.c
index 0977fb363..a181505ee 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 435,
+/**/
434,
/**/
433,