diff options
author | luukvbaal <luukvbaal@gmail.com> | 2023-06-05 16:45:33 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-05 22:45:33 +0800 |
commit | f959753e5cbc3500fedcf0de25acff0ce72e8b7f (patch) | |
tree | f183dc0c0627692129cd922e5767c5e45f63a019 | |
parent | ca26ec34386dfe98b0edf3de9aeb7b66f40d5efd (diff) | |
download | rneovim-f959753e5cbc3500fedcf0de25acff0ce72e8b7f.tar.gz rneovim-f959753e5cbc3500fedcf0de25acff0ce72e8b7f.tar.bz2 rneovim-f959753e5cbc3500fedcf0de25acff0ce72e8b7f.zip |
vim-patch:9.0.1608: update_topline() is called twice (#23920)
Problem: update_topline() is called twice.
Solution: Do not call update_topline() before curs_columns(). (Luuk van
Baal, closes vim/vim#12495)
https://github.com/vim/vim/commit/5c606846b9a43c7e6b94c7e96838f7532792f557
-rw-r--r-- | src/nvim/window.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c index 7ec0e20515..8c2d2e3da2 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -6610,9 +6610,6 @@ void scroll_to_fraction(win_T *wp, int prev_height) } if (wp == curwin) { - if (get_scrolloff_value(wp)) { - update_topline(wp); - } curs_columns(wp, false); // validate w_wrow } if (prev_height > 0) { @@ -6668,11 +6665,8 @@ void win_set_inner_size(win_T *wp, bool valid_cursor) if (valid_cursor) { changed_line_abv_curs_win(wp); invalidate_botline_win(wp); - if (wp == curwin) { - skip_update_topline = (*p_spk != 'c'); - update_topline(wp); + if (wp == curwin && *p_spk == 'c') { curs_columns(wp, true); // validate w_wrow - skip_update_topline = false; } } redraw_later(wp, UPD_NOT_VALID); |