adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.0380: Calculating line height for unnecessary amount of lines

Browse Source 
Problem:  Calculating line height for unnecessary amount of lines with
          half-page scrolling (zhscn, after 9.1.0280)
Solution: Replace "limit_winheight" argument with higher resolution
          "max" argument to which to limit the calculated line height
          in plines_m_win() to (Luuk van Baal)

fixes: #14650
closes: #14652

Signed-off-by: Luuk van Baal <luukvbaal@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Luuk van Baal
2024-04-28 16:24:02 +02:00
committed by Christian Brabandt
parent f351fd8292
commit 32d701f51b
6 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/misc1.c
View File

@ -497,12 +497,17 @@ plines_win_col(win_T *wp, linenr_T lnum, long column)
return lines;
}
/*
* Return number of window lines the physical line range from "first" until
* "last" will occupy in window "wp". Takes into account folding, 'wrap',
* topfill and filler lines beyond the end of the buffer. Limit to "max" lines.
*/
int
plines_m_win(win_T *wp, linenr_T first, linenr_T last, int limit_winheight)
plines_m_win(win_T *wp, linenr_T first, linenr_T last, int max)
{
int count = 0;
while (first <= last && (!limit_winheight || count < wp->w_height))
while (first <= last && count < max)
{
#ifdef FEAT_FOLDING
int x;
@ -531,9 +536,7 @@ plines_m_win(win_T *wp, linenr_T first, linenr_T last, int limit_winheight)
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);
return MIN(max, count);
}
int