From 44d4f0357341d661a8fa7bd88c244e0ab196a838 Mon Sep 17 00:00:00 2001 From: Luuk van Baal Date: Wed, 19 Apr 2023 00:19:26 +0200 Subject: fix(column): rebuild status column when sign column is invalid --- src/nvim/option.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/nvim/option.c') diff --git a/src/nvim/option.c b/src/nvim/option.c index 3b674ce726..5466dc97e9 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -2189,9 +2189,8 @@ static const char *set_bool_option(const int opt_idx, char *const varp, const in errmsg = did_set_spelllang(curwin); } } else if ((int *)varp == &curwin->w_p_nu && *curwin->w_p_stc != NUL) { - // When 'statuscolumn' is set and 'number' is changed: - curwin->w_nrwidth_line_count = 0; // make sure width is reset - curwin->w_statuscol_line_count = 0; // make sure width is re-estimated + // When 'number' is changed and 'statuscolumn' is set, make sure width is reset. + curwin->w_nrwidth_line_count = 0; } if ((int *)varp == &curwin->w_p_arab) { @@ -5531,6 +5530,13 @@ int win_signcol_configured(win_T *wp, int *is_fixed) if (*scl == 'n' && (*(scl + 1) == 'o' || (*(scl + 1) == 'u' && (wp->w_p_nu || wp->w_p_rnu)))) { + if (!wp->w_buffer->b_signcols.valid) { + FOR_ALL_WINDOWS_IN_TAB(win, curtab) { + if (*win->w_p_stc != NUL) { + win->w_nrwidth_line_count = 0; + } + } + } if (*wp->w_p_stc != NUL) { buf_signcols(wp->w_buffer, 0); } -- cgit