diff options
| author | Luuk van Baal <luukvbaal@gmail.com> | 2024-04-09 22:43:49 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-04-09 22:43:49 +0200 |
| commit | 08b0f632c125514fe0ea188c36ac048d7d7929d4 (patch) | |
| tree | 421b119a51b623bb188982b9747042fbb10cfd38 | |
| parent | 41208884b8c1a73b42ddb6c1e5f008dae6aa0a83 (diff) | |
patch 9.1.0294: Text height function does not respect it's argumentv9.1.0294
Problem: plines_m_win() does not take into account it's "limit_winheight"
argument for filler lines below the last line of the buffer.
(after v9.1.0280)
Solution: Check window height when "limit_winheight" is TRUE.
(Luuk van Baal)
closes: #14449
Signed-off-by: Luuk van Baal <luukvbaal@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | src/misc1.c | 15 | ||||
| -rw-r--r-- | src/move.c | 2 | ||||
| -rw-r--r-- | src/popupwin.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_diffmode.vim | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
5 files changed, 21 insertions, 14 deletions
diff --git a/src/misc1.c b/src/misc1.c index 7ee471233b..c5a0c38527 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -502,7 +502,7 @@ plines_m_win(win_T *wp, linenr_T first, linenr_T last, int limit_winheight) { int count = 0; - while (first <= last) + while (first <= last && (!limit_winheight || count < wp->w_height)) { #ifdef FEAT_FOLDING int x; @@ -519,17 +519,20 @@ plines_m_win(win_T *wp, linenr_T first, linenr_T last, int limit_winheight) #endif { #ifdef FEAT_DIFF - if (first == wp->w_buffer->b_ml.ml_line_count) - count += diff_check_fill(wp, first + 1); if (first == wp->w_topline) - count += plines_win_nofill(wp, first, limit_winheight) - + wp->w_topfill; + count += plines_win_nofill(wp, first, FALSE) + wp->w_topfill; else #endif - count += plines_win(wp, first, limit_winheight); + count += plines_win(wp, first, FALSE); ++first; } } +#ifdef FEAT_DIFF + if (first == wp->w_buffer->b_ml.ml_line_count + 1) + count += diff_check_fill(wp, first); +#endif + if (limit_winheight && count > wp->w_height) + return wp->w_height; return (count); } diff --git a/src/move.c b/src/move.c index 9853b0b8da..8c6fbd6b88 100644 --- a/src/move.c +++ b/src/move.c @@ -3210,7 +3210,7 @@ pagescroll(int dir, long count, int half) { int n = plines_correct_topline(curwin, curwin->w_topline, FALSE); if (n - count < curwin->w_height && curwin->w_topline < buflen) - n += plines_m_win(curwin, curwin->w_topline + 1, buflen, TRUE); + n += plines_m_win(curwin, curwin->w_topline + 1, buflen, FALSE); if (n - count < curwin->w_height) count = n - curwin->w_height; } diff --git a/src/popupwin.c b/src/popupwin.c index bdf4ac7cfd..25bb15349e 100644 --- a/src/popupwin.c +++ b/src/popupwin.c @@ -654,7 +654,7 @@ popup_show_curline(win_T *wp) wp->w_topline = wp->w_buffer->b_ml.ml_line_count; while (wp->w_topline < wp->w_cursor.lnum && wp->w_topline < wp->w_buffer->b_ml.ml_line_count - && plines_m_win(wp, wp->w_topline, wp->w_cursor.lnum, TRUE) + && plines_m_win(wp, wp->w_topline, wp->w_cursor.lnum, FALSE) > wp->w_height) ++wp->w_topline; } diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim index f28e840ac5..098d5d0fc6 100644 --- a/src/testdir/test_diffmode.vim +++ b/src/testdir/test_diffmode.vim @@ -2025,17 +2025,19 @@ endfunc " Ctrl-D reveals filler lines below the last line in the buffer. func Test_diff_eob_halfpage() - 5new + new call setline(1, ['']->repeat(10) + ['a']) diffthis - call assert_true(5, winheight(5)) - 5new + new call setline(1, ['']->repeat(3) + ['a', 'b']) diffthis + resize 5 wincmd j - resize 7 - exe "norm! G\<C-D>" - call assert_equal(6, line('w0')) + resize 5 + norm G + call assert_equal(7, line('w0')) + exe "norm! \<C-D>" + call assert_equal(8, line('w0')) %bwipe! endfunc diff --git a/src/version.c b/src/version.c index 70f1425a3b..f39d30a1d3 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 */ /**/ + 294, +/**/ 293, /**/ 292, |