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

patch 9.0.0146: missing part of change for "override" flag

Browse Source 
Problem:    Missing part of change for "override" flag.
Solution:   Add the missing change.
This commit is contained in:
Bram Moolenaar
2022-08-05 20:03:55 +01:00
parent 213bbaf15a
commit 4d2031fdbe
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/drawline.c
View File

@@ -348,7 +348,7 @@ win_line(
proptype_T *text_prop_type = NULL; proptype_T *text_prop_type = NULL;
int text_prop_attr = 0; int text_prop_attr = 0;
int text_prop_id = 0; // active property ID int text_prop_id = 0; // active property ID
int text_prop_combine = FALSE; int text_prop_flags = 0;
int text_prop_follows = FALSE; // another text prop to display int text_prop_follows = FALSE; // another text prop to display
#endif #endif
#ifdef FEAT_SPELL #ifdef FEAT_SPELL
@@ -1505,7 +1505,7 @@ win_line(
} }
text_prop_attr = 0; text_prop_attr = 0;
text_prop_combine = FALSE; text_prop_flags = 0;
text_prop_type = NULL; text_prop_type = NULL;
text_prop_id = 0; text_prop_id = 0;
if (text_props_active > 0 && n_extra == 0) if (text_props_active > 0 && n_extra == 0)
@@ -1535,7 +1535,7 @@ win_line(
text_prop_type = pt; text_prop_type = pt;
text_prop_attr = text_prop_attr =
hl_combine_attr(text_prop_attr, used_attr); hl_combine_attr(text_prop_attr, used_attr);
text_prop_combine = pt->pt_flags & PT_FLAG_COMBINE; text_prop_flags = pt->pt_flags;
text_prop_id = text_props[tpi].tp_id; text_prop_id = text_props[tpi].tp_id;
other_tpi = used_tpi; other_tpi = used_tpi;
used_tpi = tpi; used_tpi = tpi;
@@ -1566,7 +1566,7 @@ win_line(
text_prop_attr = 0; text_prop_attr = 0;
if (*ptr == NUL) if (*ptr == NUL)
// don't combine char attr after EOL // don't combine char attr after EOL
text_prop_combine = FALSE; text_prop_flags &= ~PT_FLAG_COMBINE;
// Keep in sync with where // Keep in sync with where
// textprop_size_after_trunc() is called in // textprop_size_after_trunc() is called in
@@ -1704,7 +1704,7 @@ win_line(
// Combine text property highlight into syntax highlight. // Combine text property highlight into syntax highlight.
if (text_prop_type != NULL) if (text_prop_type != NULL)
{ {
if (text_prop_combine) if (text_prop_flags & PT_FLAG_COMBINE)
syntax_attr = hl_combine_attr(syntax_attr, text_prop_attr); syntax_attr = hl_combine_attr(syntax_attr, text_prop_attr);
else else
syntax_attr = text_prop_attr; syntax_attr = text_prop_attr;
@@ -1760,6 +1760,11 @@ win_line(
char_attr = 0; char_attr = 0;
#endif #endif
} }
#ifdef FEAT_PROP_POPUP
// override with text property highlight when "override" is TRUE
if (text_prop_type != NULL && (text_prop_flags & PT_FLAG_OVERRIDE))
char_attr = hl_combine_attr(char_attr, text_prop_attr);
#endif
} }
// combine attribute with 'wincolor' // combine attribute with 'wincolor'

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 */
/**/
146,
/**/ /**/
145, 145,
/**/ /**/