diff --git a/src/buffer.c b/src/buffer.c
index 19df710e88..4623e0ad32 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -4434,6 +4434,10 @@ get_rel_pos(wp, buf, buflen)
     above = wp->w_topline - 1;
 #ifdef FEAT_DIFF
     above += diff_check_fill(wp, wp->w_topline) - wp->w_topfill;
+    if (wp->w_topline == 1 && wp->w_topfill >= 1)
+	above = 0;  /* All buffer lines are displayed and there is an
+		     * indication of filler lines, that can be considered
+		     * seeing all lines. */
 #endif
     below = wp->w_buffer->b_ml.ml_line_count - wp->w_botline + 1;
     if (below <= 0)
diff --git a/src/version.c b/src/version.c
index 5caeaea170..01fb7a8ea6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    805,
 /**/
     804,
 /**/