From 8e74569d7ee170b8661bdc74d61cf6be95303060 Mon Sep 17 00:00:00 2001 From: Luuk van Baal Date: Sat, 6 May 2023 19:24:45 +0200 Subject: vim-patch:9.0.1513: text scrolls unnecessarily when splitting Problem: Text scrolls unnecessarily when splitting and 'splitkeep' is not "cursor". Solution: Avoid resetting w_skipcol. (Luuk van Baal, closes vim/vim#12334) https://github.com/vim/vim/commit/b926bf47d61360a4ec5e4867714a08d70fd49965 --- src/nvim/window.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/nvim/window.c') diff --git a/src/nvim/window.c b/src/nvim/window.c index a15be27f74..fd6755a382 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -1616,6 +1616,9 @@ static void win_init(win_T *newp, win_T *oldp, int flags) ? NULL : xstrdup(oldp->w_prevdir); if (*p_spk != 'c') { + if (*p_spk == 't') { + newp->w_skipcol = oldp->w_skipcol; + } newp->w_botline = oldp->w_botline; newp->w_prev_height = oldp->w_height; newp->w_prev_winrow = oldp->w_winrow; @@ -6605,13 +6608,13 @@ void win_set_inner_size(win_T *wp, bool valid_cursor) set_fraction(wp); } } - wp->w_skipcol = 0; wp->w_height_inner = height; win_comp_scroll(wp); // There is no point in adjusting the scroll position when exiting. Some // values might be invalid. if (valid_cursor && !exiting && *p_spk == 'c') { + wp->w_skipcol = 0; scroll_to_fraction(wp, prev_height); } redraw_later(wp, UPD_SOME_VALID); -- cgit