Patch 8.1.2040
Problem: No highlighting of current line in quickfix window.
Solution: Combine with line_attr.
Files: src/screen.c, src/testdir/test_quickfix.vim,
src/testdir/dumps/Test_quickfix_cwindow_1.dump,
src/testdir/dumps/Test_quickfix_cwindow_2.dump
*** ../vim-8.1.2039/src/screen.c 2019-09-15 18:11:13.304072783 +0200
--- src/screen.c 2019-09-15 19:04:08.941064798 +0200
***************
*** 4763,4776 ****
comb_attr, cul_attr);
else
#endif
char_attr = comb_attr;
}
else
char_attr = hl_combine_attr(comb_attr, char_attr);
}
# ifdef FEAT_CONCEAL
! /* no concealing past the end of the line, it interferes
! * with line highlighting */
if (c == NUL)
syntax_flags = 0;
else
--- 4763,4780 ----
comb_attr, cul_attr);
else
#endif
+ if (line_attr)
+ char_attr = hl_combine_attr(
+ comb_attr, line_attr);
+ else
char_attr = comb_attr;
}
else
char_attr = hl_combine_attr(comb_attr, char_attr);
}
# ifdef FEAT_CONCEAL
! // no concealing past the end of the line, it interferes
! // with line highlighting
if (c == NUL)
syntax_flags = 0;
else
*** ../vim-8.1.2039/src/testdir/test_quickfix.vim 2019-09-08
18:58:39.557952948 +0200
--- src/testdir/test_quickfix.vim 2019-09-15 19:01:40.533754185 +0200
***************
*** 3,8 ****
--- 3,10 ----
source check.vim
CheckFeature quickfix
+ source screendump.vim
+
set encoding=utf-8
func s:setup_commands(cchar)
***************
*** 2428,2433 ****
--- 2430,2459 ----
set efm&vim
endfunc
+ func Test_cwindow_highlight()
+ CheckScreendump
+
+ let lines =<< trim END
+ set t_u7=
+ call setline(1, ['some', 'text', 'with', 'matches'])
+ write XCwindow
+ vimgrep e XCwindow
+ redraw
+ cwindow 4
+ END
+ call writefile(lines, 'XtestCwindow')
+ let buf = RunVimInTerminal('-S XtestCwindow', #{rows: 12})
+ call VerifyScreenDump(buf, 'Test_quickfix_cwindow_1', {})
+
+ call term_sendkeys(buf, ":cnext\<CR>")
+ call VerifyScreenDump(buf, 'Test_quickfix_cwindow_2', {})
+
+ " clean up
+ call StopVimInTerminal(buf)
+ call delete('XtestCwindow')
+ call delete('XCwindow')
+ endfunc
+
func XvimgrepTests(cchar)
call s:setup_commands(a:cchar)
*** ../vim-8.1.2039/src/testdir/dumps/Test_quickfix_cwindow_1.dump
2019-09-15 19:09:03.427732076 +0200
--- src/testdir/dumps/Test_quickfix_cwindow_1.dump 2019-09-15
19:01:49.981709834 +0200
***************
*** 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|1|,|4| @11|A|l@1
+ >X+0#0000e05#ffff4012|C|w|i|n|d|o|w||+0#0000000&|1+0#af5f00255&| |c|o|l|
|4||+0#0000000&| |s|o|m|e| @52
+ |X+0#0000e05#ffffff0|C|w|i|n|d|o|w||+0#0000000&|2+0#af5f00255&| |c|o|l|
|2||+0#0000000&| |t|e|x|t| @52
+ |X+0#0000e05&|C|w|i|n|d|o|w||+0#0000000&|4+0#af5f00255&| |c|o|l|
|6||+0#0000000&| |m|a|t|c|h|e|s| @49
+ |~+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|1|,|1| @12|A|l@1
+ | +0&&@74
*** ../vim-8.1.2039/src/testdir/dumps/Test_quickfix_cwindow_2.dump
2019-09-15 19:09:03.431732058 +0200
--- src/testdir/dumps/Test_quickfix_cwindow_2.dump 2019-09-15
19:01:51.033704900 +0200
***************
*** 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+3#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||+0#0000000&| |s|o|m|e| @52
+ |X+0#0000e05#ffff4012|C|w|i|n|d|o|w||+0#0000000&|2+0#af5f00255&| |c|o|l|
|2||+0#0000000&| |t|e|x|t| @52
+ |X+0#0000e05#ffffff0|C|w|i|n|d|o|w||+0#0000000&|4+0#af5f00255&| |c|o|l|
|6||+0#0000000&| |m|a|t|c|h|e|s| @49
+ |~+0#4040ff13&| @73
+ |[+1#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&&|c|n|e|x|t| @68
*** ../vim-8.1.2039/src/version.c 2019-09-15 18:11:13.308072771 +0200
--- src/version.c 2019-09-15 19:08:49.263795371 +0200
***************
*** 759,760 ****
--- 759,762 ----
{ /* Add new patch number below this line */
+ /**/
+ 2040,
/**/
--
hundred-and-one symptoms of being an internet addict:
269. You wonder how you can make your dustbin produce Sesame Street's
Oscar's the Garbage Monster song when you empty it.
/// Bram Moolenaar -- b...@moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/201909151710.x8FHAIob032373%40masaka.moolenaar.net.
