thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.0160: some diff mode tests fail

Browse Source 
Problem:    Some diff mode tests fail.
Solution:   Only advance "ptr" when a text property follows.
This commit is contained in:
Bram Moolenaar
2022-08-06 22:23:40 +01:00
parent da70cf30ef
commit 83bf11a1ff
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/drawline.c
View File

@@ -3473,7 +3473,7 @@ win_line(
) || lcs_eol_one == -1) ) || lcs_eol_one == -1)
break; break;
#ifdef FEAT_PROP_POPUP #ifdef FEAT_PROP_POPUP
if (!wp->w_p_wrap) if (!wp->w_p_wrap && text_prop_follows)
{ {
// do not output more of the line, only the "below" prop // do not output more of the line, only the "below" prop
ptr += STRLEN(ptr); ptr += STRLEN(ptr);

2
src/version.c
View File

@@ -735,6 +735,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 */
/**/
160,
/**/ /**/
159, 159,
/**/ /**/