patch 9.1.0380: Calculating line height for unnecessary amount of lines

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>

diff --git a/src/drawscreen.c b/src/drawscreen.c
index f8818ff1aa86cf25d0966215cd11ee88122a1f68..9096c28dfe77d13e4a3dfd5692b869bd732f22e7 100644 (file)
--- a/src/drawscreen.c
+++ b/src/drawscreen.c
@@ -1781,7 +1781,7 @@ win_update(win_T *wp)
            if (j < wp->w_height - 2)           // not too far off
            {
                i = plines_m_win(wp, wp->w_topline, wp->w_lines[0].wl_lnum - 1,
-                                                                        TRUE);
+                                                               wp->w_height);
 #ifdef FEAT_DIFF
                // insert extra lines for previously invisible filler lines
                if (wp->w_lines[0].wl_lnum != wp->w_topline)

diff --git a/src/misc1.c b/src/misc1.c
index c5a0c385271e2fec9dcb4878ddf4cbaa00cdd511..8348488862412a5eada4f608c6d52e1f9ce93576 100644 (file)
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -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

diff --git a/src/move.c b/src/move.c
index 1b6e003cc0c2ad19a07a2069b94d472a5185b463..9bdd46f2cd78f430fb1af6991d5af59e0ccc5a71 100644 (file)
--- a/src/move.c
+++ b/src/move.c
@@ -1455,7 +1455,7 @@ textpos2screenpos(
 
        is_folded = hasFoldingWin(wp, lnum, &lnum, NULL, TRUE, NULL);
 #endif
-       row = plines_m_win(wp, wp->w_topline, lnum - 1, FALSE);
+       row = plines_m_win(wp, wp->w_topline, lnum - 1, INT_MAX);
        // "row" should be the screen line where line "lnum" begins, which can
        // be negative if "lnum" is "w_topline" and "w_skipcol" is non-zero.
        row -= adjust_plines_for_skipcol(wp);
@@ -3219,12 +3219,18 @@ pagescroll(int dir, long count, int half)
 
        int curscount = count;
        // Adjust count so as to not reveal end of buffer lines.
-       if (dir == FORWARD)
+       if (dir == FORWARD
+                   && (curwin->w_topline + curwin->w_height + count > buflen
+#ifdef FEAT_FOLDING
+                                                       || hasAnyFolding(curwin)
+#endif
+          ))
        {
            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, FALSE);
-           if (n - count < curwin->w_height)
+               n += plines_m_win(curwin, curwin->w_topline + 1, buflen,
+                                                   curwin->w_height + count);
+           if (n < curwin->w_height + count)
                count = n - curwin->w_height;
        }
 

diff --git a/src/popupwin.c b/src/popupwin.c
index 25bb15349e59d3c642738fd16fbb8620636d181c..38c1c9e0d0b5c609da60a6cd09ca4499bd8ed7b8 100644 (file)
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -654,8 +654,8 @@ 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, FALSE)
-                                                               > wp->w_height)
+               && plines_m_win(wp, wp->w_topline, wp->w_cursor.lnum,
+                                           wp->w_height + 1) > wp->w_height)
            ++wp->w_topline;
     }
 

diff --git a/src/proto/misc1.pro b/src/proto/misc1.pro
index e76bf75d0feea84cc2626d4592182de1f197c051..d64f961f011db5d128c717d2440ba23a7fa062df 100644 (file)
--- a/src/proto/misc1.pro
+++ b/src/proto/misc1.pro
@@ -7,7 +7,7 @@ int plines_nofill(linenr_T lnum);
 int plines_win_nofill(win_T *wp, linenr_T lnum, int limit_winheight);
 int plines_win_nofold(win_T *wp, linenr_T lnum);
 int plines_win_col(win_T *wp, linenr_T lnum, long column);
-int plines_m_win(win_T *wp, linenr_T first, linenr_T last, int limit_winheight);
+int plines_m_win(win_T *wp, linenr_T first, linenr_T last, int max);
 int gchar_pos(pos_T *pos);
 int gchar_cursor(void);
 void pchar_cursor(int c);

diff --git a/src/version.c b/src/version.c
index 0f665efd6990e64c0543798e01153f4ad9cb6cf7..107039fadd4c9fcc74fff3d8c21fefc56fe642fe 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    380,
 /**/
     379,
 /**/