summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/edit.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/edit.c b/src/edit.c
index f89d43eec6..cb6ae7ee9b 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -525,8 +525,8 @@ edit(
#else
(int)curwin->w_wcol < mincol - curbuf->b_p_ts
#endif
- && curwin->w_wrow == W_WINROW(curwin)
- + curwin->w_height - 1 - get_scrolloff_value()
+ && curwin->w_wrow ==
+ curwin->w_height - 1 - get_scrolloff_value()
&& (curwin->w_cursor.lnum != curwin->w_topline
#ifdef FEAT_DIFF
|| curwin->w_topfill > 0
diff --git a/src/version.c b/src/version.c
index 8f6446fd88..a6dae87b5b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 14,
+/**/
13,
/**/
12,