From 35b251d2c2c9d415887d334473669ea886117356 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 6 Oct 2022 20:18:16 +0100 Subject: patch 9.0.0679: tests failing with 'smoothscroll', 'number' and "n" in 'cpo' Problem: Tests failing with 'smoothscroll', 'number' and "n" in 'cpo'. Solution: Do not count number column in topline if columns are skipped. --- src/drawline.c | 6 ++++-- src/version.c | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/drawline.c b/src/drawline.c index 4bda102bae..c38cdbc528 100644 --- a/src/drawline.c +++ b/src/drawline.c @@ -342,9 +342,11 @@ handle_lnum_col( int sign_present UNUSED, int num_attr UNUSED) { + int has_cpo_n = vim_strchr(p_cpo, CPO_NUMCOL) != NULL; + if ((wp->w_p_nu || wp->w_p_rnu) - && (wlv->row == wlv->startrow + wlv->filler_lines - || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) + && (wlv->row == wlv->startrow + wlv->filler_lines || !has_cpo_n) + && !(has_cpo_n && wp->w_skipcol > 0 && wlv->lnum == wp->w_topline)) { #ifdef FEAT_SIGNS // If 'signcolumn' is set to 'number' and a sign is present diff --git a/src/version.c b/src/version.c index 014a83c342..2e9c91db9b 100644 --- a/src/version.c +++ b/src/version.c @@ -699,6 +699,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 679, /**/ 678, /**/ -- cgit v1.2.3