diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-01-24 16:15:15 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-01-24 16:15:15 +0000 |
| commit | 7924a17791217d50be5a91989a9641bf68e7a735 (patch) | |
| tree | b26e3fd8e77637d96eedf74a47996372b8a312b6 | |
| parent | 502d8ae3e8ed8b6f8dd2ff175f154f9aa87228ef (diff) | |
| download | vim-git-7924a17791217d50be5a91989a9641bf68e7a735.tar.gz | |
patch 8.2.4204: screenpos() has non-zero row for invisible textv8.2.4204
Problem: screenpos() has non-zero row for invisible text.
Solution: Only add the window row when the text is visible. (closes #9618)
| -rw-r--r-- | src/move.c | 5 | ||||
| -rw-r--r-- | src/testdir/test_cursor_func.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/move.c b/src/move.c index b8e8780aa..f52e4c071 100644 --- a/src/move.c +++ b/src/move.c @@ -1262,12 +1262,15 @@ textpos2screenpos( if (col >= wp->w_width) col = -1; if (col >= 0 && row + rowoff <= wp->w_height) + { coloff = col - scol + wp->w_wincol + 1; + row += W_WINROW(wp); + } else // character is left, right or below of the window row = rowoff = scol = ccol = ecol = 0; } - *rowp = W_WINROW(wp) + row + rowoff; + *rowp = row + rowoff; *scolp = scol + coloff; *ccolp = ccol + coloff; *ecolp = ecol + coloff; diff --git a/src/testdir/test_cursor_func.vim b/src/testdir/test_cursor_func.vim index 965c70496..bc12511af 100644 --- a/src/testdir/test_cursor_func.vim +++ b/src/testdir/test_cursor_func.vim @@ -124,7 +124,7 @@ func Test_screenpos() \ 'col': wincol + 7, \ 'curscol': wincol + 7, \ 'endcol': wincol + 7}, winid->screenpos(line('$'), 8)) - call assert_equal({'row': winrow - 1, 'col': 0, 'curscol': 0, 'endcol': 0}, + call assert_equal({'row': 0, 'col': 0, 'curscol': 0, 'endcol': 0}, \ winid->screenpos(line('$'), 22)) close diff --git a/src/version.c b/src/version.c index c75fe9937..2208c1c2a 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4204, +/**/ 4203, /**/ 4202, |