diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-08-04 17:43:25 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-08-04 17:43:25 +0200 |
| commit | 29bc9db36e41cb519dca9381cc29a3fc1ff02106 (patch) | |
| tree | 73299978927534dae07d86a6e83dfae5f4853829 | |
| parent | 43fe32900c12fea5f9e15ee94ac850e95ec73188 (diff) | |
patch 7.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.
| -rw-r--r-- | src/buffer.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 0 deletions
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 @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 805, +/**/ 804, /**/ 803, |