summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2015-08-04 17:43:25 +0200
committerBram Moolenaar <bram@vim.org>2015-08-04 17:43:25 +0200
commitca5d9fc6fc893ecff015e9d8b74e54b5f67ed965 (patch)
tree18e8a95b0e675e239cb906c6a6c25ab8fd1902c7 /src
parent7ceafe0873f30db84612d926d16bb986058ab7f4 (diff)
downloadvim-ca5d9fc6fc893ecff015e9d8b74e54b5f67ed965.tar.gz
patch 7.4.805v7.4.805v7-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.
Diffstat (limited to 'src')
-rw-r--r--src/buffer.c4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/buffer.c b/src/buffer.c
index 19df710e..4623e0ad 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 5caeaea1..01fb7a8e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 805,
+/**/
804,
/**/
803,