diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-10-06 20:18:16 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-10-06 20:18:16 +0100 |
| commit | 35b251d2c2c9d415887d334473669ea886117356 (patch) | |
| tree | 464d7c5573340828a13d358c6c51da6e451dd629 | |
| parent | 97f0eb169bf805c372b13c6bc9a03da2e75e3354 (diff) | |
patch 9.0.0679: tests failing with 'smoothscroll', 'number' and "n" in 'cpo'v9.0.0679
Problem: Tests failing with 'smoothscroll', 'number' and "n" in 'cpo'.
Solution: Do not count number column in topline if columns are skipped.
| -rw-r--r-- | src/drawline.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 2 deletions
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 @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 679, +/**/ 678, /**/ 677, |