summaryrefslogtreecommitdiff
path: root/src/move.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-07-21 18:04:56 +0200
committerBram Moolenaar <Bram@vim.org>2021-07-21 18:04:56 +0200
commit189663bdac1156237c49925f77bd197c1bdea12c (patch)
tree3d8aae555cf828d371f727d182e64a6a38c9d763 /src/move.c
parent11d7e62f1d29fdd7a88b86131b7bbb853f29fe8b (diff)
downloadvim-git-189663bdac1156237c49925f77bd197c1bdea12c.tar.gz
patch 8.2.3193: screenpos() is wrong when 'display' is "lastline"v8.2.3193
Problem: screenpos() is wrong when the last line is partially visible and 'display' is "lastline". Solution: Also compute the position for a partially visible line. (closes #8599)
Diffstat (limited to 'src/move.c')
-rw-r--r--src/move.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/move.c b/src/move.c
index ed220f76c..21e2a5d46 100644
--- a/src/move.c
+++ b/src/move.c
@@ -1229,7 +1229,7 @@ textpos2screenpos(
int rowoff = 0;
colnr_T coloff = 0;
- if (pos->lnum >= wp->w_topline && pos->lnum < wp->w_botline)
+ if (pos->lnum >= wp->w_topline && pos->lnum <= wp->w_botline)
{
colnr_T off;
colnr_T col;
@@ -1256,11 +1256,11 @@ textpos2screenpos(
col -= wp->w_leftcol;
if (col >= wp->w_width)
col = -1;
- if (col >= 0)
+ if (col >= 0 && row + rowoff <= wp->w_height)
coloff = col - scol + wp->w_wincol + 1;
else
- // character is left or right of the window
- row = scol = ccol = ecol = 0;
+ // character is left, right or below of the window
+ row = rowoff = scol = ccol = ecol = 0;
}
*rowp = W_WINROW(wp) + row + rowoff;
*scolp = scol + coloff;