patch 9.0.1016: screenpos() does not count filler lines for diff mode
Problem: screenpos() does not count filler lines for diff mode.
Solution: Add filler lines. (closes 11658)
diff --git a/src/move.c b/src/move.c
index 954a137..fde7f20 100644
--- a/src/move.c
+++ b/src/move.c
@@ -1426,6 +1426,12 @@
is_folded = hasFoldingWin(wp, lnum, &lnum, NULL, TRUE, NULL);
#endif
row = plines_m_win(wp, wp->w_topline, lnum - 1) + 1;
+
+#ifdef FEAT_DIFF
+ // Add filler lines above this buffer line.
+ row += diff_check_fill(wp, lnum);
+#endif
+
#ifdef FEAT_FOLDING
if (is_folded)
{