GitHub/vim
1
0
Fork 0
mirror of https://github.com/vim/vim synced 2025-07-16 01:01:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

patch 9.0.0679: tests failing with 'smoothscroll', 'number' and "n" in 'cpo'

Browse Source 
Problem:    Tests failing with 'smoothscroll', 'number' and "n" in 'cpo'.
Solution:   Do not count number column in topline if columns are skipped.
This commit is contained in:
Bram Moolenaar
2022-10-06 20:18:16 +01:00
parent 97f0eb169b
commit 35b251d2c2
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/drawline.c
View File

@ -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

2
src/version.c
View File

@ -699,6 +699,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
679,
/**/
678,
/**/