patch 7.4.805

Problem:    The ruler shows "Bot" even when there are only filler lines
            missing. (Gary Johnson)
Solution:   Use "All" when the first line and one filler line are visible.

diff --git a/src/buffer.c b/src/buffer.c
index 19df710e8873bd32c6be7e7b06cb3ac768978623..4623e0ad32c382337689ff6f1fe8f2e7950e68df 100644 (file)
--- 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 5caeaea1707631df57f136e5f02b02fb6614e1cc..01fb7a8ea6f43f59add54cbaf0040e7e914e95d0 100644 (file)
--- 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,
 /**/