diff options
40 files changed, 81 insertions, 85 deletions
diff --git a/src/highlight.c b/src/highlight.c index 3381208fd1..85726f828d 100644 --- a/src/highlight.c +++ b/src/highlight.c @@ -221,8 +221,8 @@ static char *(highlight_init_light[]) = { CENT("SignColumn term=standout ctermbg=Grey ctermfg=DarkBlue", "SignColumn term=standout ctermbg=Grey ctermfg=DarkBlue guibg=Grey guifg=DarkBlue"), #endif - CENT("Visual term=reverse", - "Visual term=reverse guibg=LightGrey"), + CENT("Visual ctermbg=DarkGrey ctermfg=White", + "Visual ctermbg=DarkGrey ctermfg=White guibg=LightGrey"), #ifdef FEAT_DIFF CENT("DiffAdd term=bold ctermbg=LightBlue", "DiffAdd term=bold ctermbg=LightBlue guibg=LightBlue"), @@ -310,8 +310,8 @@ static char *(highlight_init_dark[]) = { CENT("SignColumn term=standout ctermbg=DarkGrey ctermfg=Cyan", "SignColumn term=standout ctermbg=DarkGrey ctermfg=Cyan guibg=Grey guifg=Cyan"), #endif - CENT("Visual term=reverse", - "Visual term=reverse guibg=DarkGrey"), + CENT("Visual ctermbg=Grey ctermfg=Black", + "Visual ctermbg=Grey ctermfg=Black guibg=#575757"), #ifdef FEAT_DIFF CENT("DiffAdd term=bold ctermbg=DarkBlue", "DiffAdd term=bold ctermbg=DarkBlue guibg=DarkBlue"), @@ -438,14 +438,8 @@ init_highlight( // With 8 colors brown is equal to yellow, need to use black for Search fg // to avoid Statement highlighted text disappears. // Clear the attributes, needed when changing the t_Co value. - if (t_colors > 8) - do_highlight((char_u *)(*p_bg == 'l' - ? "Visual cterm=NONE ctermbg=LightGrey" - : "Visual cterm=NONE ctermbg=DarkGrey"), FALSE, TRUE); - else + if (t_colors <= 8) { - do_highlight((char_u *)"Visual cterm=reverse ctermbg=NONE", - FALSE, TRUE); if (*p_bg == 'l') do_highlight((char_u *)"Search ctermfg=black", FALSE, TRUE); } diff --git a/src/testdir/dumps/Test_balloon_eval_term_02.dump b/src/testdir/dumps/Test_balloon_eval_term_02.dump index 51c5e328d3..4771b32958 100644 --- a/src/testdir/dumps/Test_balloon_eval_term_02.dump +++ b/src/testdir/dumps/Test_balloon_eval_term_02.dump @@ -1,6 +1,6 @@ |o+0&#ffffff0|n|e| |o|n|e| |o|n|e| @38 |t|w|o| |t|X|o| |t|w|o| @38 -|t|h|r|e|e+0&#e0e0e08| |t|h>r+0&#ffffff0|e@1| |t|h|r|e@1| @32 +|t|h|r|e|e+0#ffffff16#6c6c6c255| |t|h>r+0#0000000#ffffff0|e@1| |t|h|r|e@1| @32 |~+0#4040ff13&| @2| +0#0000001#ffd7ff255@17| +0#4040ff13#ffffff0@27 |~| @2| +0#0000001#ffd7ff255|l|i|n|e| |3| |c|o|l|u|m|n| |5|:| | +0#4040ff13#ffffff0@27 |~| @2| +0#0000001#ffd7ff255|e| |t|h|r|<| @10| +0#4040ff13#ffffff0@27 diff --git a/src/testdir/dumps/Test_cursorline_with_visualmode_01.dump b/src/testdir/dumps/Test_cursorline_with_visualmode_01.dump index b6e20b7ce6..d0b3677246 100644 --- a/src/testdir/dumps/Test_cursorline_with_visualmode_01.dump +++ b/src/testdir/dumps/Test_cursorline_with_visualmode_01.dump @@ -1,9 +1,9 @@ -|a+0&#e0e0e08|b|c| | +0&#ffffff0@70 -|a+0&#e0e0e08|b|c| | +0&#ffffff0@70 -|a+0&#e0e0e08|b|c| | +0&#ffffff0@70 -|a+0&#e0e0e08|b|c| | +0&#ffffff0@70 -|a+0&#e0e0e08|b|c| | +0&#ffffff0@70 ->a|b+0&#e0e0e08|c| | +0&#ffffff0@70 +|a+0#ffffff16#6c6c6c255|b|c| | +0#0000000#ffffff0@70 +|a+0#ffffff16#6c6c6c255|b|c| | +0#0000000#ffffff0@70 +|a+0#ffffff16#6c6c6c255|b|c| | +0#0000000#ffffff0@70 +|a+0#ffffff16#6c6c6c255|b|c| | +0#0000000#ffffff0@70 +|a+0#ffffff16#6c6c6c255|b|c| | +0#0000000#ffffff0@70 +>a|b+0#ffffff16#6c6c6c255|c| | +0#0000000#ffffff0@70 |a|b|c| @71 |a|b|c| @71 |a|b|c| @71 diff --git a/src/testdir/dumps/Test_display_scroll_update_visual.dump b/src/testdir/dumps/Test_display_scroll_update_visual.dump index c174390d7b..3f5a01f27a 100644 --- a/src/testdir/dumps/Test_display_scroll_update_visual.dump +++ b/src/testdir/dumps/Test_display_scroll_update_visual.dump @@ -1,4 +1,4 @@ -| +0#0000e05#a8a8a8255@1>f+0#0000000#ffffff0|o+0&#e0e0e08@1| | +0&#ffffff0@53 +| +0#0000e05#a8a8a8255@1>f+0#0000000#ffffff0|o+0#ffffff16#6c6c6c255@1| | +0#0000000#ffffff0@53 | +0#0000e05#a8a8a8255@1|f+0#0000000#ffffff0|o@1| @54 | +0#0000e05#a8a8a8255@1|f+0#0000000#ffffff0|o@1| @54 | +0#0000e05#a8a8a8255@1|f+0#0000000#ffffff0|o@1| @54 diff --git a/src/testdir/dumps/Test_echowin_showmode.dump b/src/testdir/dumps/Test_echowin_showmode.dump index 24eb4d0233..ec5110225e 100644 --- a/src/testdir/dumps/Test_echowin_showmode.dump +++ b/src/testdir/dumps/Test_echowin_showmode.dump @@ -1,4 +1,4 @@ ->o+0&#ffffff0|n+0&#e0e0e08|e| | +0&#ffffff0@70 +>o+0&#ffffff0|n+0#ffffff16#6c6c6c255|e| | +0#0000000#ffffff0@70 |t|w|o| @71 |~+0#4040ff13&| @73 |~| @73 diff --git a/src/testdir/dumps/Test_hlsearch_visual_1.dump b/src/testdir/dumps/Test_hlsearch_visual_1.dump index 99150dbe3b..dcdbe3aa78 100644 --- a/src/testdir/dumps/Test_hlsearch_visual_1.dump +++ b/src/testdir/dumps/Test_hlsearch_visual_1.dump @@ -1,6 +1,6 @@ -|x+0&#ffffff0@2| |y+2&#ffff4012|y+2&#e0e0e08@1| +0&&|z@2| | +0&#ffffff0@27 -|x+0&#e0e0e08@2| |y+2&&@2| +0&&|z@2| | +0&#ffffff0@27 -|x+0&#e0e0e08@2| |y+2&&>y+2&#ffff4012@1| +0&#ffffff0|z@2| @28 +|x+0&#ffffff0@2| |y+2&#ffff4012|y+2#ffffff16#6c6c6c255@1| +0&&|z@2| | +0#0000000#ffffff0@27 +|x+0#ffffff16#6c6c6c255@2| |y+2&&@2| +0&&|z@2| | +0#0000000#ffffff0@27 +|x+0#ffffff16#6c6c6c255@2| |y+2&&>y+2#0000000#ffff4012@1| +0&#ffffff0|z@2| @28 |~+0#4040ff13&| @38 |~| @38 |-+2#0000000&@1| |V|I|S|U|A|L| |-@1|3+0&&| @8|3|,|6| @10|A|l@1| diff --git a/src/testdir/dumps/Test_popup_command_03.dump b/src/testdir/dumps/Test_popup_command_03.dump index fa2ac70b0e..c01af05ca2 100644 --- a/src/testdir/dumps/Test_popup_command_03.dump +++ b/src/testdir/dumps/Test_popup_command_03.dump @@ -1,5 +1,5 @@ |o+0&#ffffff0|n|e| |t|w|o| |t|h|r|e@1| |f|o|u|r| |f|i|v|e| @51 -|a|n|d| |o|n|e| |t|w|o| |X+0&#e0e0e08|t|h|r|e@1> +0&#ffffff0|f|o|u|r| |f|i|v|e| @46 +|a|n|d| |o|n|e| |t|w|o| |X+0#ffffff16#6c6c6c255|t|h|r|e@1> +0#0000000#ffffff0|f|o|u|r| |f|i|v|e| @46 |o|n|e| |m|o|r|e| |t|w|o| |t|h|r|e@1| |f|o|u|r| |f|i|v|e| @46 |~+0#4040ff13&| @73 |~| @73 diff --git a/src/testdir/dumps/Test_prop_inserts_text_1.dump b/src/testdir/dumps/Test_prop_inserts_text_1.dump index 7d1b1027ad..3e4d74abcb 100644 --- a/src/testdir/dumps/Test_prop_inserts_text_1.dump +++ b/src/testdir/dumps/Test_prop_inserts_text_1.dump @@ -1,6 +1,6 @@ |i+0&#ffffff0|n|s|e|r|t| |s|o|m|e| |t|e|x|t| |S+0#ffffff16#e000002|O|M|E| |h+0#0000000#ffffff0|e|r|e| |a|n|d| |o|t|h|e|r| |t|e|x|t| |O+0&#ffff4012|T|H|E|R| |t+0&#ffffff0|h|e|r|e| |a|n|d| |s|o |m|e| |m|o|r|e| |t|e|x|t| |a|f|t|e|r| |M+0fd7ff255|O|R|E| |w+0&#ffffff0|r|a|p@1|i|n>g| @27 -|p|r|e|s+0&#e0e0e08|ö|m|e|和*&|平|t+&|é|x|t|p+0&#ffffff0|o|s|t| @40 +|p|r|e|s+0#ffffff16#6c6c6c255|ö|m|e|和*&|平|t+&|é|x|t|p+0#0000000#ffffff0|o|s|t| @40 |F|o@1| |f|o@1| |=| |{| |.+0#0000e05&|x|=|1+0#0000000&|,| |.+0#0000e05&|y|=|2+0#0000000&| |}|;| @34 |e+0#ffffff16#e000002|m|p|t|y| |l|i|n|e| +0#0000000#ffffff0@49 |l|o@1|k| |n|o| |h|i|g|h|l|i|g|h|t| @42 diff --git a/src/testdir/dumps/Test_prop_inserts_text_2.dump b/src/testdir/dumps/Test_prop_inserts_text_2.dump index 2a5b2f3a75..08bbcb93f8 100644 --- a/src/testdir/dumps/Test_prop_inserts_text_2.dump +++ b/src/testdir/dumps/Test_prop_inserts_text_2.dump @@ -1,6 +1,6 @@ | +0#0000e05#a8a8a8255@1|i+0#0000000#ffffff0|n|s|e|r|t| |s|o|m|e| |t|e|x|t| |S+0#ffffff16#e000002|O|M|E| |h+0#0000000#ffffff0|e|r|e| |a|n|d| |o|t|h|e|r| |t|e|x|t| |O+0&#ffff4012|T|H|E|R| |t+0&#ffffff0|h|e|r|e| |a|n|d| | +0#0000e05#a8a8a8255@1|s+0#0000000#ffffff0|o|m|e| |m|o|r|e| |t|e|x|t| |a|f|t|e|r| |M+0fd7ff255|O|R|E| |w+0&#ffffff0|r|a|p@1|i|n>g| @23 -| +0#0000e05#a8a8a8255@1|p+0#0000000#ffffff0|r|e|s+0&#e0e0e08|ö|m|e|和*&|平|t+&|é|x|t|p+0&#ffffff0|o|s|t| @38 +| +0#0000e05#a8a8a8255@1|p+0#0000000#ffffff0|r|e|s+0#ffffff16#6c6c6c255|ö|m|e|和*&|平|t+&|é|x|t|p+0#0000000#ffffff0|o|s|t| @38 | +0#0000e05#a8a8a8255@1|F+0#0000000#ffffff0|o@1| |f|o@1| |=| |{| |.+0#0000e05&|x|=|1+0#0000000&|,| |.+0#0000e05&|y|=|2+0#0000000&| |}|;| @32 | +0#0000e05#a8a8a8255@1|e+0#ffffff16#e000002|m|p|t|y| |l|i|n|e| +0#0000000#ffffff0@47 | +0#0000e05#a8a8a8255@1|l+0#0000000#ffffff0|o@1|k| |n|o| |h|i|g|h|l|i|g|h|t| @40 diff --git a/src/testdir/dumps/Test_prop_inserts_text_3.dump b/src/testdir/dumps/Test_prop_inserts_text_3.dump index 36a4b8ce1e..7fe8a86ead 100644 --- a/src/testdir/dumps/Test_prop_inserts_text_3.dump +++ b/src/testdir/dumps/Test_prop_inserts_text_3.dump @@ -1,6 +1,6 @@ | +0#0000e05#a8a8a8255@1|i+0#0000000#ffffff0|n|s|e|r|t| |s|o|m|e| |t|e|x|t| |S+0#ffffff16#e000002|O|M|E| |h+0#0000000#ffffff0|e|r|e| |a|n|d| |o|t|h|e|r| |t|e|x|t| |O+0&#ffff4012|T|H|E|R| |t+0&#ffffff0|h|e|r|e| |a|n|d| | +0#0000e05#a8a8a8255@1|s+0#0000000#ffffff0|o|m|e| |m|o|r|e| |t|e|x|t| |a|f|t|e|r| |M+0fd7ff255|O|R|E| |w+0&#ffffff0|r|a|p@1|i|n|g| @23 -| +0#0000e05#a8a8a8255@1|p+0#0000000#ffffff0|r|e|s+0&#e0e0e08|ö|m|e|和*&|平|t+&|é|x|t|p+0&#ffffff0|o|s>t| @38 +| +0#0000e05#a8a8a8255@1|p+0#0000000#ffffff0|r|e|s+0#ffffff16#6c6c6c255|ö|m|e|和*&|平|t+&|é|x|t|p+0#0000000#ffffff0|o|s>t| @38 | +0#0000e05#a8a8a8255@1|F+0#0000000#ffffff0|o@1| |f|o@1| |=| |{| |.+0#0000e05&|x|=|1+0#0000000&|,| |.+0#0000e05&|y|=|2+0#0000000&| |}|;| @32 | +0#0000e05#a8a8a8255@1|e+0#ffffff16#e000002|m|p|t|y| |l|i|n|e| +0#0000000#ffffff0@47 | +0#0000e05#a8a8a8255@1|l+0#0000000#ffffff0|o@1|k| |n|o| |h|i|g|h|l|i|g|h|t| @40 diff --git a/src/testdir/dumps/Test_prop_inserts_text_4.dump b/src/testdir/dumps/Test_prop_inserts_text_4.dump index 8bb637af11..efae55310d 100644 --- a/src/testdir/dumps/Test_prop_inserts_text_4.dump +++ b/src/testdir/dumps/Test_prop_inserts_text_4.dump @@ -1,6 +1,6 @@ | +0#0000e05#a8a8a8255@1|i+0#0000000#ffffff0|n|s|e|r|t| |s|o|m|e| |t|e|x|t| |S+0#ffffff16#e000002|O|M|E| |h+0#0000000#ffffff0|e|r|e| |a|n|d| |o|t|h|e|r| |t|e|x|t| |O+0&#ffff4012|T|H|E|R| |t+0&#ffffff0|h|e|r|e| |a|n|d| | +0#0000e05#a8a8a8255@1|s+0#0000000#ffffff0|o|m|e| |m|o|r|e| |t|e|x|t| |a|f|t|e|r| |M+0fd7ff255|O|R|E| |w+0&#ffffff0|r|a|p@1|i|n|g| @23 -| +0#0000e05#a8a8a8255@1|p+0#0000000#ffffff0|r|e|s+0&#e0e0e08|ö|m|e|和*&|平|t+&|é|x|t|p+0&#ffffff0|o|s|t| @38 +| +0#0000e05#a8a8a8255@1|p+0#0000000#ffffff0|r|e|s+0#ffffff16#6c6c6c255|ö|m|e|和*&|平|t+&|é|x|t|p+0#0000000#ffffff0|o|s|t| @38 | +0#0000e05#a8a8a8255@1|F+0#0000000#ffffff0|o@1| |f|o@1| |=| |{| |.+0#0000e05&|x|=>1+0#0000000&|,| |.+0#0000e05&|y|=|2+0#0000000&| |}|;| @32 | +0#0000e05#a8a8a8255@1|e+0#ffffff16#e000002|m|p|t|y| |l|i|n|e| +0#0000000#ffffff0@47 | +0#0000e05#a8a8a8255@1|l+0#0000000#ffffff0|o@1|k| |n|o| |h|i|g|h|l|i|g|h|t| @40 diff --git a/src/testdir/dumps/Test_prop_inserts_text_5.dump b/src/testdir/dumps/Test_prop_inserts_text_5.dump index 75194f6158..cb48661989 100644 --- a/src/testdir/dumps/Test_prop_inserts_text_5.dump +++ b/src/testdir/dumps/Test_prop_inserts_text_5.dump @@ -1,6 +1,6 @@ | +0#0000e05#a8a8a8255@1|i+0#0000000#ffffff0|n|s|e|r|t| |s|o|m|e| |t|e|x|t| |S+0#ffffff16#e000002|O|M|E| |h+0#0000000#ffffff0|e|r|e| |a|n|d| |o|t|h|e|r| |t|e|x|t| |O+0&#ffff4012|T|H|E|R| |t+0&#ffffff0|h|e|r|e| |a|n|d| | +0#0000e05#a8a8a8255@1|s+0#0000000#ffffff0|o|m|e| |m|o|r|e| |t|e|x|t| |a|f|t|e|r| |M+0fd7ff255|O|R|E| |w+0&#ffffff0|r|a|p@1|i|n|g| @23 -| +0#0000e05#a8a8a8255@1|p+0#0000000#ffffff0|r|e|s+0&#e0e0e08|ö|m|e|和*&|平|t+&|é|x|t|p+0&#ffffff0|o|s|t| @38 +| +0#0000e05#a8a8a8255@1|p+0#0000000#ffffff0|r|e|s+0#ffffff16#6c6c6c255|ö|m|e|和*&|平|t+&|é|x|t|p+0#0000000#ffffff0|o|s|t| @38 | +0#0000e05#a8a8a8255@1|F+0#0000000#ffffff0|o@1| |f|o@1| |=| |{| |.+0#0000e05&|x|=|1+0#0000000&|,| |.+0#0000e05&|y|=>2+0#0000000&| |}|;| @32 | +0#0000e05#a8a8a8255@1|e+0#ffffff16#e000002|m|p|t|y| |l|i|n|e| +0#0000000#ffffff0@47 | +0#0000e05#a8a8a8255@1|l+0#0000000#ffffff0|o@1|k| |n|o| |h|i|g|h|l|i|g|h|t| @40 diff --git a/src/testdir/dumps/Test_prop_inserts_text_6.dump b/src/testdir/dumps/Test_prop_inserts_text_6.dump index fb25ddf309..de2bf45047 100644 --- a/src/testdir/dumps/Test_prop_inserts_text_6.dump +++ b/src/testdir/dumps/Test_prop_inserts_text_6.dump @@ -1,6 +1,6 @@ | +0#0000e05#a8a8a8255@1|i+0#0000000#ffffff0|n|s|e|r|t| |s|o|m|e| |t|e|x|t| |S+0#ffffff16#e000002|O|M|E| |h+0#0000000#ffffff0|e|r|e| |a|n|d| |o|t|h|e|r| |t|e|x|t| |O+0&#ffff4012|T|H|E|R| |t+0&#ffffff0|h|e|r|e| |a|n|d| | +0#0000e05#a8a8a8255@1|s+0#0000000#ffffff0|o|m|e| |m|o|r|e| |t|e|x|t| |a|f|t|e|r| |M+0fd7ff255|O|R|E| |w+0&#ffffff0|r|a|p@1|i|n|g| @23 -| +0#0000e05#a8a8a8255@1|p+0#0000000#ffffff0|r|e|s+0&#e0e0e08|ö|m|e|和*&|平|t+&|é|x|t|p+0&#ffffff0|o|s|t| @38 +| +0#0000e05#a8a8a8255@1|p+0#0000000#ffffff0|r|e|s+0#ffffff16#6c6c6c255|ö|m|e|和*&|平|t+&|é|x|t|p+0#0000000#ffffff0|o|s|t| @38 | +0#0000e05#a8a8a8255@1|F+0#0000000#ffffff0|o@1| |f|o@1| |=| |{| |.+0#0000e05&|x|=|1+0#0000000&|,| |.+0#0000e05&|y|=|2+0#0000000&| |}|;| @32 | +0#0000e05#a8a8a8255@1>e+0#ffffff16#e000002|m|p|t|y| |l|i|n|e| +0#0000000#ffffff0@47 | +0#0000e05#a8a8a8255@1|l+0#0000000#ffffff0|o@1|k| |n|o| |h|i|g|h|l|i|g|h|t| @40 diff --git a/src/testdir/dumps/Test_prop_inserts_text_visual_block_2.dump b/src/testdir/dumps/Test_prop_inserts_text_visual_block_2.dump index 2383b4a0a1..7d6865ecd7 100644 --- a/src/testdir/dumps/Test_prop_inserts_text_visual_block_2.dump +++ b/src/testdir/dumps/Test_prop_inserts_text_visual_block_2.dump @@ -1,6 +1,6 @@ -|1+0&#e0e0e08|2|3+0&#ffffff0|4|5|6|7|8|9| @50 -|1+0&#e0e0e08|-+0#e000e06#ffffff0|口*&|-+&|2+0#0000000&|3|4|5|6|7|8|9| @46 -|1+0&#e0e0e08|2|口*0#e000e06#ffffff0|3+0#0000000&|4|5|6|7|8|9| @48 -|1+0&#e0e0e08>2+0&#ffffff0|3|4|5|6|7|8|9| @50 +|1+0#ffffff16#6c6c6c255|2|3+0#0000000#ffffff0|4|5|6|7|8|9| @50 +|1+0#ffffff16#6c6c6c255|-+0#e000e06#ffffff0|口*&|-+&|2+0#0000000&|3|4|5|6|7|8|9| @46 +|1+0#ffffff16#6c6c6c255|2|口*0#e000e06#ffffff0|3+0#0000000&|4|5|6|7|8|9| @48 +|1+0#ffffff16#6c6c6c255>2+0#0000000#ffffff0|3|4|5|6|7|8|9| @50 |~+0#4040ff13&| @58 |-+2#0000000&@1| |V|I|S|U|A|L| |B|L|O|C|K| |-@1| +0&&@13|4|x|2| @6|4|,|2| @10|A|l@1| diff --git a/src/testdir/dumps/Test_prop_inserts_text_visual_block_3.dump b/src/testdir/dumps/Test_prop_inserts_text_visual_block_3.dump index 920cb1d7b9..32d3942474 100644 --- a/src/testdir/dumps/Test_prop_inserts_text_visual_block_3.dump +++ b/src/testdir/dumps/Test_prop_inserts_text_visual_block_3.dump @@ -1,6 +1,6 @@ -|1+0&#e0e0e08|2|3|4+0&#ffffff0|5|6|7|8|9| @50 -|1+0&#e0e0e08|-+0#e000e06#ffffff0|口*&|-+&|2+0#0000000&|3|4|5|6|7|8|9| @46 -|1+0&#e0e0e08|2|口*0#e000e06#ffffff0|3+0#0000000&|4|5|6|7|8|9| @48 -|1+0&#e0e0e08|2>3+0&#ffffff0|4|5|6|7|8|9| @50 +|1+0#ffffff16#6c6c6c255|2|3|4+0#0000000#ffffff0|5|6|7|8|9| @50 +|1+0#ffffff16#6c6c6c255|-+0#e000e06#ffffff0|口*&|-+&|2+0#0000000&|3|4|5|6|7|8|9| @46 +|1+0#ffffff16#6c6c6c255|2|口*0#e000e06#ffffff0|3+0#0000000&|4|5|6|7|8|9| @48 +|1+0#ffffff16#6c6c6c255|2>3+0#0000000#ffffff0|4|5|6|7|8|9| @50 |~+0#4040ff13&| @58 |-+2#0000000&@1| |V|I|S|U|A|L| |B|L|O|C|K| |-@1| +0&&@13|4|x|3| @6|4|,|3| @10|A|l@1| diff --git a/src/testdir/dumps/Test_prop_inserts_text_visual_block_4.dump b/src/testdir/dumps/Test_prop_inserts_text_visual_block_4.dump index 0017f02240..dfd627ffa8 100644 --- a/src/testdir/dumps/Test_prop_inserts_text_visual_block_4.dump +++ b/src/testdir/dumps/Test_prop_inserts_text_visual_block_4.dump @@ -1,6 +1,6 @@ -|1+0&#e0e0e08|2|3|4|5|6|7|8+0&#ffffff0|9| @50 -|1+0&#e0e0e08|-+0#e000e06#ffffff0|口*&|-+&|2+0#0000000#e0e0e08|3|4+0&#ffffff0|5|6|7|8|9| @46 -|1+0&#e0e0e08|2|口*0#e000e06#ffffff0|3+0#0000000#e0e0e08|4|5|6+0&#ffffff0|7|8|9| @48 -|1+0&#e0e0e08|2|3|4|5|6>7+0&#ffffff0|8|9| @50 +|1+0#ffffff16#6c6c6c255|2|3|4|5|6|7|8+0#0000000#ffffff0|9| @50 +|1+0#ffffff16#6c6c6c255|-+0#e000e06#ffffff0|口*&|-+&|2+0#ffffff16#6c6c6c255|3|4+0#0000000#ffffff0|5|6|7|8|9| @46 +|1+0#ffffff16#6c6c6c255|2|口*0#e000e06#ffffff0|3+0#ffffff16#6c6c6c255|4|5|6+0#0000000#ffffff0|7|8|9| @48 +|1+0#ffffff16#6c6c6c255|2|3|4|5|6>7+0#0000000#ffffff0|8|9| @50 |~+0#4040ff13&| @58 |-+2#0000000&@1| |V|I|S|U|A|L| |B|L|O|C|K| |-@1| +0&&@13|4|x|7| @6|4|,|7| @10|A|l@1| diff --git a/src/testdir/dumps/Test_prop_inserts_text_visual_block_5.dump b/src/testdir/dumps/Test_prop_inserts_text_visual_block_5.dump index cb7e0c90af..67164b9869 100644 --- a/src/testdir/dumps/Test_prop_inserts_text_visual_block_5.dump +++ b/src/testdir/dumps/Test_prop_inserts_text_visual_block_5.dump @@ -1,6 +1,6 @@ -|1+0&#ffffff0|2+0&#e0e0e08|3|4|5|6|7|8+0&#ffffff0|9| @50 -|1|-+0#e000e06&|口*&|-+&|2+0#0000000#e0e0e08|3|4+0&#ffffff0|5|6|7|8|9| @46 -|1|2+0&#e0e0e08|口*0#e000e06#ffffff0|3+0#0000000#e0e0e08|4|5|6+0&#ffffff0|7|8|9| @48 -|1>2|3+0&#e0e0e08|4|5|6|7|8+0&#ffffff0|9| @50 +|1+0&#ffffff0|2+0#ffffff16#6c6c6c255|3|4|5|6|7|8+0#0000000#ffffff0|9| @50 +|1|-+0#e000e06&|口*&|-+&|2+0#ffffff16#6c6c6c255|3|4+0#0000000#ffffff0|5|6|7|8|9| @46 +|1|2+0#ffffff16#6c6c6c255|口*0#e000e06#ffffff0|3+0#ffffff16#6c6c6c255|4|5|6+0#0000000#ffffff0|7|8|9| @48 +|1>2|3+0#ffffff16#6c6c6c255|4|5|6|7|8+0#0000000#ffffff0|9| @50 |~+0#4040ff13&| @58 |-+2#0000000&@1| |V|I|S|U|A|L| |B|L|O|C|K| |-@1| +0&&@13|4|x|6| @6|4|,|2| @10|A|l@1| diff --git a/src/testdir/dumps/Test_prop_inserts_text_visual_block_6.dump b/src/testdir/dumps/Test_prop_inserts_text_visual_block_6.dump index c4be65f298..81e894ce34 100644 --- a/src/testdir/dumps/Test_prop_inserts_text_visual_block_6.dump +++ b/src/testdir/dumps/Test_prop_inserts_text_visual_block_6.dump @@ -1,6 +1,6 @@ -|1+0&#ffffff0|2|3+0&#e0e0e08|4|5|6|7|8+0&#ffffff0|9| @50 -|1|-+0#e000e06&|口*&|-+&|2+0#0000000#e0e0e08|3|4+0&#ffffff0|5|6|7|8|9| @46 -|1|2|口*0#e000e06&|3+0#0000000#e0e0e08|4|5|6+0&#ffffff0|7|8|9| @48 -|1|2>3|4+0&#e0e0e08|5|6|7|8+0&#ffffff0|9| @50 +|1+0&#ffffff0|2|3+0#ffffff16#6c6c6c255|4|5|6|7|8+0#0000000#ffffff0|9| @50 +|1|-+0#e000e06&|口*&|-+&|2+0#ffffff16#6c6c6c255|3|4+0#0000000#ffffff0|5|6|7|8|9| @46 +|1|2|口*0#e000e06&|3+0#ffffff16#6c6c6c255|4|5|6+0#0000000#ffffff0|7|8|9| @48 +|1|2>3|4+0#ffffff16#6c6c6c255|5|6|7|8+0#0000000#ffffff0|9| @50 |~+0#4040ff13&| @58 |-+2#0000000&@1| |V|I|S|U|A|L| |B|L|O|C|K| |-@1| +0&&@13|4|x|5| @6|4|,|3| @10|A|l@1| diff --git a/src/testdir/dumps/Test_prop_inserts_text_visual_block_7.dump b/src/testdir/dumps/Test_prop_inserts_text_visual_block_7.dump index 54c7fde43a..e1045ff6a2 100644 --- a/src/testdir/dumps/Test_prop_inserts_text_visual_block_7.dump +++ b/src/testdir/dumps/Test_prop_inserts_text_visual_block_7.dump @@ -1,6 +1,6 @@ -|1+0&#ffffff0|2|3|4+0&#e0e0e08|5|6|7|8+0&#ffffff0|9| @50 -|1|-+0#e000e06&|口*&|-+&|2+0#0000000#e0e0e08|3|4+0&#ffffff0|5|6|7|8|9| @46 -|1|2|口*0#e000e06&|3+0#0000000#e0e0e08|4|5|6+0&#ffffff0|7|8|9| @48 -|1|2|3>4|5+0&#e0e0e08|6|7|8+0&#ffffff0|9| @50 +|1+0&#ffffff0|2|3|4+0#ffffff16#6c6c6c255|5|6|7|8+0#0000000#ffffff0|9| @50 +|1|-+0#e000e06&|口*&|-+&|2+0#ffffff16#6c6c6c255|3|4+0#0000000#ffffff0|5|6|7|8|9| @46 +|1|2|口*0#e000e06&|3+0#ffffff16#6c6c6c255|4|5|6+0#0000000#ffffff0|7|8|9| @48 +|1|2|3>4|5+0#ffffff16#6c6c6c255|6|7|8+0#0000000#ffffff0|9| @50 |~+0#4040ff13&| @58 |-+2#0000000&@1| |V|I|S|U|A|L| |B|L|O|C|K| |-@1| +0&&@13|4|x|4| @6|4|,|4| @10|A|l@1| diff --git a/src/testdir/dumps/Test_prop_with_text_above_6.dump b/src/testdir/dumps/Test_prop_with_text_above_6.dump index da282285f6..941abb6b6a 100644 --- a/src/testdir/dumps/Test_prop_with_text_above_6.dump +++ b/src/testdir/dumps/Test_prop_with_text_above_6.dump @@ -1,6 +1,6 @@ | +0#0000e05#a8a8a8255@1| +0#af5f00255#ffffff0@3|f+0#0000000#ffff4012|i|r|s|t| |t|h|i|n|g| |a|b|o|v|e| +0&#ffffff0@36 | +0#0000e05#a8a8a8255@1| +0#af5f00255#ffffff0@3|s+0#0000000#ffd7ff255|e|c|o|n|d| |t|h|i|n|g| |a|b|o|v|e| +0&#ffffff0@35 -| +0#0000e05#a8a8a8255@1| +0#af5f00255#ffffff0@1|1| |i+0#0000000#e0e0e08|n|s|e|r|t|e>d+0&#ffffff0| |o|n|e| |t|w|o| @37 +| +0#0000e05#a8a8a8255@1| +0#af5f00255#ffffff0@1|1| |i+0#ffffff16#6c6c6c255|n|s|e|r|t|e>d+0#0000000#ffffff0| |o|n|e| |t|w|o| @37 | +0#0000e05#a8a8a8255@1| +0#af5f00255#ffffff0@3|b+0#0000000#5fd7ff255|e|l|o|w| +0&#ffffff0@48 | +0#0000e05#a8a8a8255@1| +0#af5f00255#ffffff0@1|2| |t+0#0000000&|h|r|e@1| |f|o|u|r| @43 | +0#0000e05#a8a8a8255@1| +0#af5f00255#ffffff0@3| +0#0000000&@2|a+0&#ffff4012|n|o|t|h|e|r| |t|h|i|n|g| +0&#ffffff0@37 diff --git a/src/testdir/dumps/Test_prop_with_text_above_7.dump b/src/testdir/dumps/Test_prop_with_text_above_7.dump index c50749b81a..bcfada2177 100644 --- a/src/testdir/dumps/Test_prop_with_text_above_7.dump +++ b/src/testdir/dumps/Test_prop_with_text_above_7.dump @@ -1,6 +1,6 @@ | +0#0000e05#a8a8a8255@1| +0#af5f00255#ffffff0@3|f+0#0000000#ffff4012|i|r|s|t| |t|h|i|n|g| |a|b|o|v|e| +0&#ffffff0@36 | +0#0000e05#a8a8a8255@1| +0#af5f00255#ffffff0@3|s+0#0000000#ffd7ff255|e|c|o|n|d| |t|h|i|n|g| |a|b|o|v|e| +0&#ffffff0@35 -| +0#0000e05#a8a8a8255@1| +0#af5f00255#ffffff0@1|1| |i+0#0000000#e0e0e08|n|s|e|r|t|e>d+0&#ffffff0| +0&#e0e0e08|o|n|e| |t|w|o| +0&#ffffff0@37 +| +0#0000e05#a8a8a8255@1| +0#af5f00255#ffffff0@1|1| |i+0#ffffff16#6c6c6c255|n|s|e|r|t|e>d+0#0000000#ffffff0| +0#ffffff16#6c6c6c255|o|n|e| |t|w|o| +0#0000000#ffffff0@37 | +0#0000e05#a8a8a8255@1| +0#af5f00255#ffffff0@3|b+0#0000000#5fd7ff255|e|l|o|w| +0#4040ff13#ffffff0| +0#0000000&@47 | +0#0000e05#a8a8a8255@1| +0#af5f00255#ffffff0@1|2| |t+0#0000000&|h|r|e@1| |f|o|u|r| @43 | +0#0000e05#a8a8a8255@1| +0#af5f00255#ffffff0@3| +0#0000000&@2|a+0&#ffff4012|n|o|t|h|e|r| |t|h|i|n|g| +0&#ffffff0@37 diff --git a/src/testdir/dumps/Test_prop_with_text_empty_line_6.dump b/src/testdir/dumps/Test_prop_with_text_empty_line_6.dump index 1bc9903bc0..ad28571f67 100644 --- a/src/testdir/dumps/Test_prop_with_text_empty_line_6.dump +++ b/src/testdir/dumps/Test_prop_with_text_empty_line_6.dump @@ -1,8 +1,8 @@ |X+0&#ffff4012@59 -|a+0&#e0e0e08@1>a+0&#ffffff0| @56 +|a+0#ffffff16#6c6c6c255@1>a+0#0000000#ffffff0| @56 |X+0&#ffff4012@59 @1| +0&#ffffff0@58 -|b+0&#e0e0e08@2|b+0&#ffffff0@2| @53 +|b+0#ffffff16#6c6c6c255@2|b+0#0000000#ffffff0@2| @53 |~+0#4040ff13&| @58 |~| @58 |-+2#0000000&@1| |V|I|S|U|A|L| |B|L|O|C|K| |-@1| +0&&@13|3|x|3| @6|2|,|3| @10|A|l@1| diff --git a/src/testdir/dumps/Test_prop_with_text_override_2.dump b/src/testdir/dumps/Test_prop_with_text_override_2.dump index 334929e112..48a3f3638f 100644 --- a/src/testdir/dumps/Test_prop_with_text_override_2.dump +++ b/src/testdir/dumps/Test_prop_with_text_override_2.dump @@ -1,4 +1,4 @@ -|s+0&#ffffff0|o|m+0&#e0e0e08|e| | +0#4040ff13#40ffff15|i|n|s|e|r|t|e|d| |t+0#0000000#e0e0e08|e|x|t| |h|e>r+0&#ffffff0|e| @35 +|s+0&#ffffff0|o|m+0#ffffff16#6c6c6c255|e| | +0#4040ff13#40ffff15|i|n|s|e|r|t|e|d| |t+0#ffffff16#6c6c6c255|e|x|t| |h|e>r+0#0000000#ffffff0|e| @35 |~+0#4040ff13&| @58 |~| @58 |~| @58 diff --git a/src/testdir/dumps/Test_statusline_showcmd_3.dump b/src/testdir/dumps/Test_statusline_showcmd_3.dump index 049e0f777d..e244acd3dd 100644 --- a/src/testdir/dumps/Test_statusline_showcmd_3.dump +++ b/src/testdir/dumps/Test_statusline_showcmd_3.dump @@ -1,6 +1,6 @@ -|a+0&#e0e0e08| +0&#ffffff0@73 -|b+0&#e0e0e08| +0&#ffffff0@73 -|c+0&#e0e0e08> +0&#ffffff0@73 +|a+0#ffffff16#6c6c6c255| +0#0000000#ffffff0@73 +|b+0#ffffff16#6c6c6c255| +0#0000000#ffffff0@73 +|c+0#ffffff16#6c6c6c255> +0#0000000#ffffff0@73 |~+0#4040ff13&| @73 |3+3#0000000&|x|2| @71 |-+2&&@1| |V|I|S|U|A|L| |B|L|O|C|K| |-@1| +0&&@56 diff --git a/src/testdir/dumps/Test_syntax_c_01.dump b/src/testdir/dumps/Test_syntax_c_01.dump index 72242162ed..0426a50e3a 100644 --- a/src/testdir/dumps/Test_syntax_c_01.dump +++ b/src/testdir/dumps/Test_syntax_c_01.dump @@ -4,8 +4,8 @@ | +0#0000e05&@2|i|n|t| @2|n|o|t|_|u|s|e|d|;| +0#0000000&@56 |#+0#e000e06&|e|l|s|e| +0#0000000&@69 @3|i+0#00e0003&|n|t| +0#0000000&@2|u|s|e|d|;| @60 -|#+0#e000e06&|e+0&#e0e0e08|n|d|i|f| +0#0000000&| +0&#ffffff0@67 -| +0&#e0e0e08@2|p|r|i|n|t|f|(|"+0#e000002&|J|u|s|t| |a|n| |e|x|a|m|p|l|e| |p|i|e|c|e| |o|f| >C+0&#ffffff0| |c|o|d|e|\+0#e000e06&|n|"+0#e000002&|)+0#0000000&|;| @27 +|#+0#e000e06&|e+0#ffffff16#6c6c6c255|n|d|i|f| | +0#0000000#ffffff0@67 +| +0#ffffff16#6c6c6c255@2|p|r|i|n|t|f|(|"|J|u|s|t| |a|n| |e|x|a|m|p|l|e| |p|i|e|c|e| |o|f| >C+0#e000002#ffffff0| |c|o|d|e|\+0#e000e06&|n|"+0#e000002&|)+0#0000000&|;| @27 @3|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|0+0#e000002&|x|0|f@1|;+0#0000000&| @58 |}| @73 | +0#ffffff16#ff404010@16| +0#0000000#ffffff0@57 diff --git a/src/testdir/dumps/Test_tabline_showcmd_3.dump b/src/testdir/dumps/Test_tabline_showcmd_3.dump index 3e29cda5fe..52c91be504 100644 --- a/src/testdir/dumps/Test_tabline_showcmd_3.dump +++ b/src/testdir/dumps/Test_tabline_showcmd_3.dump @@ -1,6 +1,6 @@ |3+1&#ffffff0|x|2| @71 -|a+0&#e0e0e08| +0&#ffffff0@73 -|b+0&#e0e0e08| +0&#ffffff0@73 -|c+0&#e0e0e08> +0&#ffffff0@73 +|a+0#ffffff16#6c6c6c255| +0#0000000#ffffff0@73 +|b+0#ffffff16#6c6c6c255| +0#0000000#ffffff0@73 +|c+0#ffffff16#6c6c6c255> +0#0000000#ffffff0@73 |~+0#4040ff13&| @73 |-+2#0000000&@1| |V|I|S|U|A|L| |B|L|O|C|K| |-@1| +0&&@38|3|,|2| @10|A|l@1| diff --git a/src/testdir/dumps/Test_terminal_popup_7.dump b/src/testdir/dumps/Test_terminal_popup_7.dump index e7e5aae50d..32c058ba71 100644 --- a/src/testdir/dumps/Test_terminal_popup_7.dump +++ b/src/testdir/dumps/Test_terminal_popup_7.dump @@ -4,7 +4,7 @@ |3| @12|╔+0#0000001#ffd7ff255|═@44|╗| +0#0000000#ffffff0@13 |4| @12|║+0#0000001#ffd7ff255|s|o|m|e| |t|e|x|t| @35|║| +0#0000000#ffffff0@13 |5| @12|║+0#0000001#ffd7ff255|t|o| |e+0&#ffff4012|d|i|t| +0&#ffd7ff255@37|║| +0#0000000#ffffff0@13 -|6| @12|║+0#0000001#ffd7ff255|i+0&#e0e0e08|n| |a| >p+0&#ffd7ff255|o|p|u|p| |w|i|n|d|o|w| @27|║| +0#0000000#ffffff0@13 +|6| @12|║+0#0000001#ffd7ff255|i+0#ffffff16#6c6c6c255|n| |a| >p+0#0000001#ffd7ff255|o|p|u|p| |w|i|n|d|o|w| @27|║| +0#0000000#ffffff0@13 |7| @12|║+0#0000001#ffd7ff255|~+0#4040ff13&| @43|║+0#0000001&| +0#0000000#ffffff0@13 |8| @12|║+0#0000001#ffd7ff255|~+0#4040ff13&| @43|║+0#0000001&| +0#0000000#ffffff0@13 |9| @12|║+0#0000001#ffd7ff255|~+0#4040ff13&| @43|║+0#0000001&| +0#0000000#ffffff0@13 diff --git a/src/testdir/dumps/Test_textprop_hl_override_2.dump b/src/testdir/dumps/Test_textprop_hl_override_2.dump index 187233d12a..9d05cbb0c3 100644 --- a/src/testdir/dumps/Test_textprop_hl_o |