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
commite0046ba9a1956cf609f9649bf40e377bd490e907 (patch)
treea50c34ffaa9c18f5c7b29f0feec08fd15546e7c6
parentb027dca45aecfc6e2734c2f44b5b653cd781c604 (diff)
downloadvim-e0046ba9a1956cf609f9649bf40e377bd490e907.tar.gz
updated for version 7.3.435v7.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 ddfe103b..92cd7335 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 0977fb36..a181505e 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,