Mercurial > vim
changeset 16676:79c5f723bb5d v8.1.1340
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
commit https://github.com/vim/vim/commit/bfd451283f8c37926f4b0aa22b74b534bd84e482
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri May 17 13:05:07 2019 +0200
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Problem: Attributes from 'cursorline' overwrite textprop.
Solution: Combine the attributes. (closes https://github.com/vim/vim/issues/3912)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Fri, 17 May 2019 13:15:05 +0200 |
parents | 6d9f696696fe |
children | 9e2b1e449579 |
files | src/screen.c src/testdir/dumps/Test_textprop_01.dump src/testdir/test_textprop.vim src/textprop.c src/version.c |
diffstat | 5 files changed, 10 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/screen.c +++ b/src/screen.c @@ -4306,11 +4306,15 @@ win_line( char_attr = hl_combine_attr(line_attr, area_attr); else if (search_attr != 0) char_attr = hl_combine_attr(line_attr, search_attr); - /* Use line_attr when not in the Visual or 'incsearch' area - * (area_attr may be 0 when "noinvcur" is set). */ +# ifdef FEAT_TEXT_PROP + else if (text_prop_type != NULL) + char_attr = hl_combine_attr(line_attr, text_prop_attr); +# endif else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) || vcol < fromcol || vcol_prev < fromcol_prev || vcol >= tocol)) + // Use line_attr when not in the Visual or 'incsearch' area + // (area_attr may be 0 when "noinvcur" is set). char_attr = line_attr; #else if (area_attr != 0)
--- a/src/testdir/dumps/Test_textprop_01.dump +++ b/src/testdir/dumps/Test_textprop_01.dump @@ -1,6 +1,6 @@ | +0#af5f00255#ffffff0@1|1| |O+0#0000000&|n|e| +0&#ffff4012|t|w|o| +0&#ffffff0@63 | +0#af5f00255&@1|2| |N+0#0000000#ffff4012|u|m|b|é|r| |1+0#4040ff13&|2|3| +0#0000000&|ä|n|d| |t|h|œ|n| |4+0#4040ff13&|¾|7|.+0#0000000&| +0&#ffffff0@46 -| +0#af5f00255&@1|3| >-+0#0000000#ffff4012|x+0&#ffffff0|a+0#4040ff13&@1|x+0#0000000&|-@1|x+0#4040ff13&|b@1|x+0#0000000&|-@1|x|c+0#4040ff13&@1|x|-+0#0000000&@1|x+0#4040ff13&|d@1|x|-+0#0000000&@1| @45 +| +0#af5f00255&@1|3| >-+8#0000000#ffff4012|x+8&#ffffff0|a+8#4040ff13&@1|x+8#0000000&|-@1|x+8#4040ff13&|b@1|x+8#0000000&|-@1|x|c+8#4040ff13&@1|x|-+8#0000000&@1|x+8#4040ff13&|d@1|x|-+8#0000000&@1| @45 | +0#af5f00255&@1|4| |/+0#40ff4011&@1| |c|o|m@1|e|n|t| |w+0&#e0e0e08|i|t|h| |e+8&&|r@1|o|r| +0&#ffffff0|i|n| |i|t| +0#0000000&@43 |~+0#4040ff13&| @73 |~| @73
--- a/src/testdir/test_textprop.vim +++ b/src/testdir/test_textprop.vim @@ -645,7 +645,7 @@ funct Test_textprop_screenshots() \ "call prop_add(3, 15, {'length': 2, 'type': 'both'})", \ "call prop_add(4, 12, {'length': 10, 'type': 'background'})", \ "call prop_add(4, 17, {'length': 5, 'type': 'error'})", - \ "set number", + \ "set number cursorline", \ "hi clear SpellBad", \ "set spell", \ "syn match Comment '//.*'",
--- a/src/textprop.c +++ b/src/textprop.c @@ -11,10 +11,7 @@ * Text properties implementation. See ":help text-properties". * * TODO: - * - When using 'cursorline' attributes should be merged. (#3912) * - Adjust text property column and length when text is inserted/deleted. - * -> splitting a line can create a zero-length property. Don't highlight it - * and extend it when inserting text. * -> a :substitute with a multi-line match * -> join two lines, also with BS in Insert mode * -> search for changed_bytes() from misc1.c