diff --git a/src/move.c b/src/move.c index 3a75ce36a4..67e214bf97 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 a015595d10..3a95f317e9 100644 --- a/src/version.c +++ b/src/version.c @@ -738,6 +738,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 177, /**/ 176, /**/