mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-29 06:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28790 from luukvbaal/vim-9.1.0414

Browse Source 
vim-patch:9.1.{0414,0416}
This commit is contained in:
zeertzjq
2024-05-18 06:13:46 +08:00
committed by GitHub
parent 512d228111 f178b8ba49
commit 5f9e7edae6
3 changed files with 139 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/nvim/move.c
View File

@@ -1579,8 +1579,20 @@ void adjust_skipcol(void)
redraw_later(curwin, UPD_NOT_VALID);
return; // don't scroll in the other direction now
}
colnr_T col = curwin->w_virtcol - curwin->w_skipcol + scrolloff_cols;
int row = 0;
colnr_T 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;
row++;
@@ -2114,7 +2126,10 @@ void scroll_cursor_bot(win_T *wp, int min_scroll, bool set_topbot)
wp->w_valid |= VALID_TOPLINE;
wp->w_viewport_invalid = true;
cursor_correct_sms(wp);
// Make sure cursor is still visible after adjusting skipcol for "zb".
if (set_topbot) {
cursor_correct_sms(wp);
}
}
/// Recompute topline to put the cursor halfway across the window