summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-02-11 18:58:09 +0100
committerBram Moolenaar <Bram@vim.org>2014-02-11 18:58:09 +0100
commitb8e2305656adeb9357e726742bfe0e91e88cda28 (patch)
tree9b172320cddb675def7f51c1f8fba33c264dfeff
parent2d5f38ff10a955058416b93aae774aeef1c34486 (diff)
downloadvim-git-b8e2305656adeb9357e726742bfe0e91e88cda28.tar.gz
updated for version 7.4.177v7.4.177
Problem: Compiler warning for unused variable. (Tony Mechelynck) Solution: Add #ifdef.
-rw-r--r--src/move.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/move.c b/src/move.c
index 3a75ce36a..67e214bf9 100644
--- a/src/move.c
+++ b/src/move.c
@@ -2101,7 +2101,9 @@ scroll_cursor_halfway(atend)
int used;
lineoff_T loff;
lineoff_T boff;
+#ifdef FEAT_DIFF
linenr_T old_topline = curwin->w_topline;
+#endif
loff.lnum = boff.lnum = curwin->w_cursor.lnum;
#ifdef FEAT_FOLDING
diff --git a/src/version.c b/src/version.c
index a015595d1..3a95f317e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 177,
+/**/
176,
/**/
175,