diff options
| -rw-r--r-- | src/move.c | 6 | ||||
| -rw-r--r-- | src/testdir/test_cursor_func.vim | 16 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 24 insertions, 0 deletions
diff --git a/src/move.c b/src/move.c index 954a13714..fde7f20e2 100644 --- a/src/move.c +++ b/src/move.c @@ -1426,6 +1426,12 @@ textpos2screenpos( 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) { diff --git a/src/testdir/test_cursor_func.vim b/src/testdir/test_cursor_func.vim index 8bdc956e2..fe64be0e7 100644 --- a/src/testdir/test_cursor_func.vim +++ b/src/testdir/test_cursor_func.vim @@ -156,6 +156,22 @@ func Test_screenpos_fold() bwipe! endfunc +func Test_screenpos_diff() + CheckFeature diff + + enew! + call setline(1, ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i']) + vnew + call setline(1, ['a', 'b', 'c', 'g', 'h', 'i']) + windo diffthis + wincmd w + call assert_equal(#{col: 3, row: 7, endcol: 3, curscol: 3}, screenpos(0, 4, 1)) + + windo diffoff + bwipe! + bwipe! +endfunc + func Test_screenpos_number() rightbelow new rightbelow 73vsplit diff --git a/src/version.c b/src/version.c index a19d94765..3dbc0a0a5 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1016, +/**/ 1015, /**/ 1014, |