Mercurial > vim

changeset 29662:b03c47618895 v9.0.0171

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Bram Moolenaar <Bram@vim.org>
date Mon, 08 Aug 2022 17:15:03 +0200
parents 4e08213f76c6
children 5009fd4e3de6
files src/drawline.c src/version.c
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,