GitHub/vim
1
0
Fork 0
mirror of https://github.com/vim/vim synced 2025-07-15 16:51:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.1496: terminal: still not highlighting empty cells correctly

Browse Source 
Problem:  terminal: still not highlighting empty cells correctly
          (Yousef Mohammed, after v9.1.1489)
Solution: Use vcol instead of col

closes: #17632

Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christian Brabandt
2025-06-29 22:22:05 +02:00
parent 2bfd1ee161
commit 66b72f48c3
4 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/drawline.c
View File

@ -2774,7 +2774,7 @@ win_line(
skip_cells = 0;
#ifdef FEAT_TERMINAL
if (term_show_buffer(wp->w_buffer)
&& wlv.col == 0
&& wlv.vcol == 0
&& wlv.win_attr == term_get_attr(wp, lnum, -1))
// reset highlighting attribute
wlv.win_attr = 0;

15
src/testdir/dumps/Test_terminal_empty_listchars2.dump Normal file
View File

@ -0,0 +1,15 @@
| +0#af5f00255#ffffff0@1|1| |h+0#0000001#a8a8a8255|e|l@1|o| +0#0000000#ffffff0@65
| +0#af5f00255&@1|2| | +0#0000001#a8a8a8255| +0#0000000#ffffff0@69
| +0#af5f00255&@1|3| >h+0#0000000&|e+0#0000001#a8a8a8255|l@1|o| +0#0000000#ffffff0@65
|~+0#4040ff13&| @73
|~| @73
|~| @73
|!+2#ffffff16#00e0003|s|h| |-|c| |"|p|r|i|n|t|f| |'|h|e|l@1|o|\@1|n|\@1|n|h|e|l@1|o|'|"| |[|f|i|n|i|s|h|e|d|]| @11|3|,|1| @11|A|l@1
| +0#0000000#ffffff0@74
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|[+1#0000000&|N|o| |N|a|m|e|]| @47|0|,|0|-|1| @9|A|l@1
|-+2&&@1| |V|I|S|U|A|L| |L|I|N|E| |-@1| +0&&@46|3| @9

4
src/testdir/test_terminal3.vim
View File

@ -1032,6 +1032,10 @@ func Test_terminal_visual_empty_listchars()
call term_wait(buf)
call term_sendkeys(buf, "V2k")
call VerifyScreenDump(buf, 'Test_terminal_empty_listchars', {})
call term_sendkeys(buf, "\<esc>")
call term_sendkeys(buf, ":set nu\<cr>")
call term_sendkeys(buf, "ggV2j")
call VerifyScreenDump(buf, 'Test_terminal_empty_listchars2', {})
call StopVimInTerminal(buf)
endfunc

2
src/version.c
View File

@ -719,6 +719,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1496,
/**/
1495,
/**/