patch 9.0.0171: quickfix line highlight is overruled by 'cursorline'

Problem:    Quickfix line highlight is overruled by 'cursorline'.
Solution:   Reverse the combination of attributes. (closes #10654)

diff --git a/src/drawline.c b/src/drawline.c
index eaae4bed3651f37b88bb29c2c4ad29038fed86b6..a435e4e841ae6bd0628ca90e9cac3060465d2e94 100644 (file)
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -1159,7 +1159,10 @@ win_line(
                else
 # endif
 # if defined(FEAT_QUICKFIX)
-                   line_attr = hl_combine_attr(line_attr, cul_attr);
+                   // let the line attribute overrule 'cursorline', otherwise
+                   // it disappears when both have background set;
+                   // 'cursorline' can use underline or bold to make it show
+                   line_attr = hl_combine_attr(cul_attr, line_attr);
 # else
                    line_attr = cul_attr;
 # endif

diff --git a/src/version.c b/src/version.c
index f9b5c2afcd0a062d0b5b6ee3268fb4f21d3c2e0f..63a0eae2c873250c340960aed294276ae244ce7f 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 */
+/**/
+    171,
 /**/
     170,
 /**/