mirror of
https://github.com/neovim/neovim.git
synced 2024-12-19 18:55:14 -07:00
vim-patch:9.1.0014: incorrect use of W_WINROW in edit.c (#26910)
Problem: incorrect use of W_WINROW in edit.c Solution: compare against curwin->w_height instead Remove incorrect use of W_WINROW In structs.h it is mentioned that w_wrow is relative to w_winrow, so using W_WINROW doesn't make sense when comparing with window height. This change won't lead to any observable behavior change: The condition intends to check if there are 'scrolloff' lines between the current cursor when the bottom of the window. When W_WINROW(curwin) is added to curwin->w_height - 1 - get_scrolloff_value(), the condition is instead satisfied when the cursor is on some screen line below that position. However, - If 'scrolloff' is smaller than half the window height, this condition can only be satisfied when W_WINROW(curwin) == 0. And if it is not satisfied, update_topline() does the actual scrolling. - If 'scrolloff' is larger than half the window height, update_topline() will put the cursor at the center of the window soon afterwards anyway, because set_topline() now unsets VALID_TOPLINE flag starting from7db7bb45b0
. To put it in another way,7db7bb45b0
makes the update_topline() just below correct the mistakes made in this block, so this incorrect use of W_WINROW() no longer affects observable behavior. closes: vim/vim#12331b1ed7ec9f7
This commit is contained in:
parent
a18b4af759
commit
28c183b38c
@ -458,8 +458,7 @@ static int insert_check(VimState *state)
|
||||
if (curwin->w_wcol < s->mincol - tabstop_at(get_nolist_virtcol(),
|
||||
curbuf->b_p_ts,
|
||||
curbuf->b_p_vts_array)
|
||||
&& curwin->w_wrow == curwin->w_winrow
|
||||
+ curwin->w_height_inner - 1 - get_scrolloff_value(curwin)
|
||||
&& curwin->w_wrow == curwin->w_height_inner - 1 - get_scrolloff_value(curwin)
|
||||
&& (curwin->w_cursor.lnum != curwin->w_topline
|
||||
|| curwin->w_topfill > 0)) {
|
||||
if (curwin->w_topfill > 0) {
|
||||
|
Loading…
Reference in New Issue
Block a user