From 3725116f6ec3b5c01e456b151a60c0690e04f76c Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 6 Oct 2022 20:48:00 +0100 Subject: patch 9.0.0680: tests failing with 'breakindent', 'number' and "n" in 'cpo' Problem: Tests failing with 'breakindent', 'number' and "n" in 'cpo'. Solution: Do count the number column in topline if 'breakindent' is set. --- src/drawline.c | 8 +++++++- src/version.c | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/drawline.c b/src/drawline.c index c38cdbc52..f738e76b4 100644 --- a/src/drawline.c +++ b/src/drawline.c @@ -346,7 +346,13 @@ handle_lnum_col( if ((wp->w_p_nu || wp->w_p_rnu) && (wlv->row == wlv->startrow + wlv->filler_lines || !has_cpo_n) - && !(has_cpo_n && wp->w_skipcol > 0 && wlv->lnum == wp->w_topline)) + // there is no line number in a wrapped line when "n" is in + // 'cpoptions', but 'breakindent' assumes it anyway. + && !((has_cpo_n +#ifdef FEAT_LINEBREAK + && !wp->w_p_bri +#endif + ) && 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 2e9c91db9..346894dd6 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 */ +/**/ + 680, /**/ 679, /**/ -- cgit v1.2.1