To: vim_dev@googlegroups.com
Subject: Patch 9.0.0032
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.0032
Problem:    In the quickfix window 'cursorline' overrules QuickFixLine
            highlighting.
Solution:   Combine the attributes.  Add a test. (closes #10654)
Files:      src/drawline.c, src/testdir/test_quickfix.vim,
            src/testdir/dumps/Test_quickfix_cwindow_3.dump,
            src/testdir/dumps/Test_quickfix_cwindow_4.dump


*** ../vim-9.0.0031/src/drawline.c	2022-06-10 15:24:32.000000000 +0100
--- src/drawline.c	2022-07-03 14:20:34.543993702 +0100
***************
*** 970,976 ****
--- 970,980 ----
  		}
  		else
  # endif
+ # if defined(FEAT_QUICKFIX)
+ 		    line_attr = hl_combine_attr(line_attr, cul_attr);
+ # else
  		    line_attr = cul_attr;
+ # endif
  	    }
  	    else
  	    {
*** ../vim-9.0.0031/src/testdir/test_quickfix.vim	2022-06-29 12:54:48.068572061 +0100
--- src/testdir/test_quickfix.vim	2022-07-03 14:17:08.243515679 +0100
***************
*** 3136,3141 ****
--- 3136,3147 ----
    call term_sendkeys(buf, ":cnext\<CR>")
    call VerifyScreenDump(buf, 'Test_quickfix_cwindow_2', {})
  
+   call term_sendkeys(buf, "\<C-W>j:set cursorline\<CR>")
+   call VerifyScreenDump(buf, 'Test_quickfix_cwindow_3', {})
+ 
+   call term_sendkeys(buf, "j")
+   call VerifyScreenDump(buf, 'Test_quickfix_cwindow_4', {})
+ 
    " clean up
    call StopVimInTerminal(buf)
    call delete('XtestCwindow')
*** ../vim-9.0.0031/src/testdir/dumps/Test_quickfix_cwindow_3.dump	2022-07-03 14:18:59.639809625 +0100
--- src/testdir/dumps/Test_quickfix_cwindow_3.dump	2022-07-03 14:17:22.951559936 +0100
***************
*** 0 ****
--- 1,12 ----
+ |s+0&#ffffff0|o|m|e| @70
+ |t|e|x|t| @70
+ |w|i|t|h| @70
+ |m|a|t|c|h|e|s| @67
+ |~+0#4040ff13&| @73
+ |X+1#0000000&|C|w|i|n|d|o|w| @48|2|,|2| @11|A|l@1
+ |X+0#0000e05&|C|w|i|n|d|o|w||+0#0000000&|1+0#af5f00255&| |c|o|l| |4|-|5||+0#0000000&| |s|o|m|e| @50
+ >X+8#0000e05#ffff4012|C|w|i|n|d|o|w||+8#0000000&|2+8#af5f00255&| |c|o|l| |2|-|3||+8#0000000&| |t|e|x|t| @50
+ |X+0#0000e05#ffffff0|C|w|i|n|d|o|w||+0#0000000&|4+0#af5f00255&| |c|o|l| |6|-|7||+0#0000000&| |m|a|t|c|h|e|s| @47
+ |~+0#4040ff13&| @73
+ |[+3#0000000&|Q|u|i|c|k|f|i|x| |L|i|s|t|]| |:|v|i|m|g|r|e|p| |e| |X|C|w|i|n|d|o|w| @20|2|,|1| @12|A|l@1
+ |:+0&&|s|e|t| |c|u|r|s|o|r|l|i|n|e| @59
*** ../vim-9.0.0031/src/testdir/dumps/Test_quickfix_cwindow_4.dump	2022-07-03 14:18:59.643809634 +0100
--- src/testdir/dumps/Test_quickfix_cwindow_4.dump	2022-07-03 14:17:24.111563353 +0100
***************
*** 0 ****
--- 1,12 ----
+ |s+0&#ffffff0|o|m|e| @70
+ |t|e|x|t| @70
+ |w|i|t|h| @70
+ |m|a|t|c|h|e|s| @67
+ |~+0#4040ff13&| @73
+ |X+1#0000000&|C|w|i|n|d|o|w| @48|2|,|2| @11|A|l@1
+ |X+0#0000e05&|C|w|i|n|d|o|w||+0#0000000&|1+0#af5f00255&| |c|o|l| |4|-|5||+0#0000000&| |s|o|m|e| @50
+ |X+0#0000e05#ffff4012|C|w|i|n|d|o|w||+0#0000000&|2+0#af5f00255&| |c|o|l| |2|-|3||+0#0000000&| |t|e|x|t| @50
+ >X+8#0000e05#ffffff0|C|w|i|n|d|o|w||+8#0000000&|4+8#af5f00255&| |c|o|l| |6|-|7||+8#0000000&| |m|a|t|c|h|e|s| @47
+ |~+0#4040ff13&| @73
+ |[+3#0000000&|Q|u|i|c|k|f|i|x| |L|i|s|t|]| |:|v|i|m|g|r|e|p| |e| |X|C|w|i|n|d|o|w| @20|3|,|1| @12|A|l@1
+ |:+0&&|s|e|t| |c|u|r|s|o|r|l|i|n|e| @59
*** ../vim-9.0.0031/src/version.c	2022-07-03 13:15:57.988497914 +0100
--- src/version.c	2022-07-03 14:19:08.319828798 +0100
***************
*** 737,738 ****
--- 737,740 ----
  {   /* Add new patch number below this line */
+ /**/
+     32,
  /**/

-- 
Latest survey shows that 3 out of 4 people make up 75% of the
world's population.

 /// 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    ///