thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.1.0414: Unable to leave long line with 'smoothscroll' and 'scrolloff'

Browse Source 
Problem:  Unable to leave long line with 'smoothscroll' and 'scrolloff'.
          Corrupted screen near the end of a long line with 'scrolloff'.
          (Ernie Rael, after 9.1.0280)
Solution: Only correct cursor in case scroll_cursor_bot() was not itself
          called to make the cursor visible. Avoid adjusting for
          'scrolloff' beyond the text line height (Luuk van Baal)

fixes: #14726
closes: #14783

Signed-off-by: Luuk van Baal <luukvbaal@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Luuk van Baal
2024-05-16 20:44:09 +02:00
committed by Christian Brabandt
parent f5c8f520ba
commit b32055e504
12 changed files with 114 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/move.c
View File

@@ -2027,6 +2027,8 @@ adjust_skipcol(void)
long so = get_scrolloff_value();
int scrolloff_cols = so == 0 ? 0 : width1 + (so - 1) * width2;
int scrolled = FALSE;
int row = 0;
int overlap, col;
validate_cheight();
if (curwin->w_cline_height == curwin->w_height
@@ -2041,7 +2043,7 @@ adjust_skipcol(void)
}
validate_virtcol();
int overlap = sms_marker_overlap(curwin, -1);
overlap = sms_marker_overlap(curwin, -1);
while (curwin->w_skipcol > 0
&& curwin->w_virtcol < curwin->w_skipcol + overlap + scrolloff_cols)
{
@@ -2059,8 +2061,19 @@ adjust_skipcol(void)
return; // don't scroll in the other direction now
}
int col = curwin->w_virtcol - curwin->w_skipcol + scrolloff_cols;
int row = 0;
col = curwin->w_virtcol + scrolloff_cols;
// Avoid adjusting for 'scrolloff' beyond the text line height.
if (scrolloff_cols > 0)
{
int size = win_linetabsize(curwin, curwin->w_topline,
ml_get(curwin->w_topline), (colnr_T)MAXCOL);
size = width1 + width2 * ((size - width1 + width2 - 1) / width2);
while (col > size)
col -= width2;
}
col -= curwin->w_skipcol;
if (col >= width1)
{
col -= width1;
@@ -2785,7 +2798,9 @@ scroll_cursor_bot(int min_scroll, int set_topbot)
}
curwin->w_valid |= VALID_TOPLINE;
cursor_correct_sms();
// Make sure cursor is still visible after adjusting skipcol for "zb".
if (set_topbot)
cursor_correct_sms();
}
/*