To: vim_dev@googlegroups.com
Subject: Patch 9.0.0171
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 9.0.0171
Problem:    Quickfix line highlight is overruled by 'cursorline'.
Solution:   Reverse the combination of attributes. (closes #10654)
Files:      src/drawline.c


*** ../vim-9.0.0170/src/drawline.c	2022-08-07 11:53:36.791410634 +0100
--- src/drawline.c	2022-08-08 15:59:38.066711243 +0100
***************
*** 1159,1165 ****
  		else
  # endif
  # if defined(FEAT_QUICKFIX)
! 		    line_attr = hl_combine_attr(line_attr, cul_attr);
  # else
  		    line_attr = cul_attr;
  # endif
--- 1159,1168 ----
  		else
  # endif
  # if defined(FEAT_QUICKFIX)
! 		    // 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
*** ../vim-9.0.0170/src/version.c	2022-08-08 15:49:14.192115015 +0100
--- src/version.c	2022-08-08 16:01:20.086868409 +0100
***************
*** 737,738 ****
--- 737,740 ----
  {   /* Add new patch number below this line */
+ /**/
+     171,
  /**/

-- 
       In war we're tough and able.
       Quite indefatigable
       Between our quests
       We sequin vests
       And impersonate Clark Gable
       It's a busy life in Camelot.
       I have to push the pram a lot.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///