From b6aab8f44beb8c5d99393abdc2c9faab085c72aa Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 3 Oct 2022 20:01:16 +0100 Subject: patch 9.0.0652: 'smoothscroll' not tested with 'number' and "n" in 'cpo' Problem: 'smoothscroll' not tested with 'number' and "n" in 'cpo'. Solution: Add tests, fix uncovered problem. --- src/drawscreen.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'src/drawscreen.c') diff --git a/src/drawscreen.c b/src/drawscreen.c index 47066995a5..fa5d6683df 100644 --- a/src/drawscreen.c +++ b/src/drawscreen.c @@ -1552,6 +1552,26 @@ win_update(win_T *wp) init_search_hl(wp, &screen_search_hl); #endif + // Make sure skipcol is valid, it depends on various options and the window + // width. + if (wp->w_skipcol > 0) + { + int w = 0; + int width1 = wp->w_width - win_col_off(wp); + int width2 = width1 + win_col_off2(wp); + int add = width1; + + while (w < wp->w_skipcol) + { + if (w > 0) + add = width2; + w += add; + } + if (w != wp->w_skipcol) + // always round down, the higher value may not be valid + wp->w_skipcol = w - add; + } + #ifdef FEAT_LINEBREAK // Force redraw when width of 'number' or 'relativenumber' column // changes. -- cgit v1.2.3