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

Problem:    Missing part of change for "override" flag.
Solution:   Add the missing change.

diff --git a/src/drawline.c b/src/drawline.c
index d90eef9f935997865bfca10e7be873e82f5ea422..47b8cdc94b3e8e8fa0832fc7e24f675a9586b6d6 100644 (file)
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -348,7 +348,7 @@ win_line(
     proptype_T  *text_prop_type = NULL;
     int                text_prop_attr = 0;
     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
 #endif
 #ifdef FEAT_SPELL
@@ -1505,7 +1505,7 @@ win_line(
                }
 
                text_prop_attr = 0;
-               text_prop_combine = FALSE;
+               text_prop_flags = 0;
                text_prop_type = NULL;
                text_prop_id = 0;
                if (text_props_active > 0 && n_extra == 0)
@@ -1535,7 +1535,7 @@ win_line(
                            text_prop_type = pt;
                            text_prop_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;
                            other_tpi = used_tpi;
                            used_tpi = tpi;
@@ -1566,7 +1566,7 @@ win_line(
                            text_prop_attr = 0;
                            if (*ptr == NUL)
                                // don't combine char attr after EOL
-                               text_prop_combine = FALSE;
+                               text_prop_flags &= ~PT_FLAG_COMBINE;
 
                            // Keep in sync with where
                            // textprop_size_after_trunc() is called in
@@ -1704,7 +1704,7 @@ win_line(
            // Combine text property highlight into syntax highlight.
            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);
                else
                    syntax_attr = text_prop_attr;
@@ -1760,6 +1760,11 @@ win_line(
                char_attr = 0;
 #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'

diff --git a/src/version.c b/src/version.c
index 6ca8bd08db511e5c68e8f3e89c816bf0181510c1..80b6cd677cd1e4e0ef89a00882c0431419c40a29 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    146,
 /**/
     145,
 /**/