forked from aniani/vim
patch 9.0.0160: some diff mode tests fail
Problem: Some diff mode tests fail. Solution: Only advance "ptr" when a text property follows.
This commit is contained in:
@@ -3473,7 +3473,7 @@ win_line(
|
||||
) || lcs_eol_one == -1)
|
||||
break;
|
||||
#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
|
||||
ptr += STRLEN(ptr);
|
||||
|
@@ -735,6 +735,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
160,
|
||||
/**/
|
||||
159,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user