# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1659971703 -7200
# Node ID b03c47618895fa9b5e712709457fa17b691e2ab9
# Parent  4e08213f76c67a5a921a53b2a6ac8e5b67bc4115
patch 9.0.0171: quickfix line highlight is overruled by 'cursorline'

Commit: https://github.com/vim/vim/commit/6e5c61119a07b513a99baa9618e8182a74fd7e24
Author: Bram Moolenaar <Bram@vim.org>
Date:   Mon Aug 8 16:03:06 2022 +0100

    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 https://github.com/vim/vim/issues/10654)

diff --git a/src/drawline.c b/src/drawline.c
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    171,
+/**/
     170,
 /**/
     169,