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.
diff --git a/src/drawline.c b/src/drawline.c
index 4bda102..c38cdbc 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -342,9 +342,11 @@
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