aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 9.0.0680: tests failing with 'breakindent', 'number' and "n" in 'cpo'

Browse Source 
Problem:    Tests failing with 'breakindent', 'number' and "n" in 'cpo'.
Solution:   Do count the number column in topline if 'breakindent' is set.
This commit is contained in:
Bram Moolenaar 2022-10-06 20:48:00 +01:00
parent 35b251d2c2
commit 3725116f6e
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/drawline.c
View File

@ -346,7 +346,13 @@ handle_lnum_col(
if ((wp->w_p_nu || wp->w_p_rnu) if ((wp->w_p_nu || wp->w_p_rnu)
&& (wlv->row == wlv->startrow + wlv->filler_lines || !has_cpo_n) && (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 #ifdef FEAT_SIGNS
// If 'signcolumn' is set to 'number' and a sign is present // 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[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
680,
/**/ /**/
679, 679,
/**/ /**/