comparison src/edit.c @ 34094:0b25a862bf0c v9.1.0014

patch 9.1.0014: incorrect use of W_WINROW in edit.c Commit: https://github.com/vim/vim/commit/b1ed7ec9f7d1a0142d4f1c8c83bab9172bc92c7c Author: zeertzjq <zeertzjq@outlook.com> Date: Fri Jan 5 18:11:43 2024 +0100 patch 9.1.0014: incorrect use of W_WINROW in edit.c 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 from https://github.com/vim/vim-history/commit/7db7bb45b0f919ff0615d463ebd4fde881c69d1f. To put it in another way, https://github.com/vim/vim-history/commit/7db7bb45b0f919ff0615d463ebd4fde881c69d1f 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: #12331 Signed-off-by: zeertzjq <zeertzjq@outlook.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Fri, 05 Jan 2024 18:30:03 +0100
parents 1629cc65d78d
children 8687845c326c
comparison
equal deleted inserted replaced
34093:432d67327233 34094:0b25a862bf0c
523 get_nolist_virtcol(), curbuf->b_p_ts, 523 get_nolist_virtcol(), curbuf->b_p_ts,
524 curbuf->b_p_vts_array) 524 curbuf->b_p_vts_array)
525 #else 525 #else
526 (int)curwin->w_wcol < mincol - curbuf->b_p_ts 526 (int)curwin->w_wcol < mincol - curbuf->b_p_ts
527 #endif 527 #endif
528 && curwin->w_wrow == W_WINROW(curwin) 528 && curwin->w_wrow ==
529 + curwin->w_height - 1 - get_scrolloff_value() 529 curwin->w_height - 1 - get_scrolloff_value()
530 && (curwin->w_cursor.lnum != curwin->w_topline 530 && (curwin->w_cursor.lnum != curwin->w_topline
531 #ifdef FEAT_DIFF 531 #ifdef FEAT_DIFF
532 || curwin->w_topfill > 0 532 || curwin->w_topfill > 0
533 #endif 533 #endif
534 )) 534 ))