diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-11-02 22:00:15 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-11-02 22:00:15 +0100 |
commit | 024dbd229fa7991b7bf7ef4d0888b43ab03783f7 (patch) | |
tree | d12b2978dd45ca333c33cc5d3e47d2d3ce9bf4ff /src/testdir/dumps | |
parent | f2885d3fb7045d14ae58824e9cb8dea65e4052c4 (diff) |
patch 8.1.2241: match highlight does not combine with 'wincolor'v8.1.2241
Problem: Match highlight does not combine with 'wincolor'.
Solution: Apply 'wincolor' last on top of any other attribute. (closes #5159)
Diffstat (limited to 'src/testdir/dumps')
-rw-r--r-- | src/testdir/dumps/Test_popupwin_matches.dump | 4 | ||||
-rw-r--r-- | src/testdir/dumps/Test_popupwin_menu_01.dump | 2 | ||||
-rw-r--r-- | src/testdir/dumps/Test_popupwin_menu_02.dump | 2 | ||||
-rw-r--r-- | src/testdir/dumps/Test_popupwin_menu_04.dump | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/testdir/dumps/Test_popupwin_matches.dump b/src/testdir/dumps/Test_popupwin_matches.dump index ba3e720254..6d9faf3472 100644 --- a/src/testdir/dumps/Test_popupwin_matches.dump +++ b/src/testdir/dumps/Test_popupwin_matches.dump @@ -1,8 +1,8 @@ |1+0#ffffff16#e000002@2| +0#0000000#ffffff0|2@2| |3@2| @63 ->4+0#ffffff16#e000002@2| +0#0000000#ffffff0|5@2| |6+0&#ffff4012@2| +0&#ffffff0@63 +>4+0#4040ff13&@2| +0#0000000&|5@2| |6+0&#ffff4012@2| +0&#ffffff0@63 |~+0#4040ff13&| @7|╔+0#0000001#ffd7ff255|═@10|╗| +0#4040ff13#ffffff0@52 |~| @7|║+0#0000001#ffd7ff255|1+0#ffffff16#e000002@2| +0#0000001#ffd7ff255|2@2| |3@2|║| +0#4040ff13#ffffff0@52 -|~| @7|║+0#0000001#ffd7ff255|4@2| |5+0#ffffff16#e000002@2| +0#0000001#ffd7ff255|6@2|║| +0#4040ff13#ffffff0@52 +|~| @7|║+0#0000001#ffd7ff255|4@2| |5+0#4040ff13&@2| +0#0000001&|6@2|║| +0#4040ff13#ffffff0@52 |~| @7|╚+0#0000001#ffd7ff255|═@10|╝| +0#4040ff13#ffffff0@52 |~| @73 |~| @73 diff --git a/src/testdir/dumps/Test_popupwin_menu_01.dump b/src/testdir/dumps/Test_popupwin_menu_01.dump index 3f09f3e08a..b41b39829b 100644 --- a/src/testdir/dumps/Test_popupwin_menu_01.dump +++ b/src/testdir/dumps/Test_popupwin_menu_01.dump @@ -1,7 +1,7 @@ >1+0&#ffffff0| @73 |2| @73 |3| @20|╔+0#0000001#ffd7ff255| |m|a|k|e| |a| |c|h|o|i|c|e| |f|r|o|m| |t|h|e| |l|i|s|t| |╗| +0#0000000#ffffff0@21 -|4| @20|║+0#0000001#ffd7ff255| |o+0#0000000#5fd7ff255|n|e| +0#0000001&@23| +0&#ffd7ff255|║| +0#0000000#ffffff0@21 +|4| @20|║+0#0000001#ffd7ff255| |o+0fd7ff255|n|e| @23| +0&#ffd7ff255|║| +0#0000000#ffffff0@21 |5| @20|║+0#0000001#ffd7ff255| |t|w|o| @24|║| +0#0000000#ffffff0@21 |6| @20|║+0#0000001#ffd7ff255| |a|n|o|t|h|e|r| @20|║| +0#0000000#ffffff0@21 |7| @20|╚+0#0000001#ffd7ff255|═@28|╝| +0#0000000#ffffff0@21 diff --git a/src/testdir/dumps/Test_popupwin_menu_02.dump b/src/testdir/dumps/Test_popupwin_menu_02.dump index 464e276434..b7a40e81da 100644 --- a/src/testdir/dumps/Test_popupwin_menu_02.dump +++ b/src/testdir/dumps/Test_popupwin_menu_02.dump @@ -3,7 +3,7 @@ |3| @20|╔+0#0000001#ffd7ff255| |m|a|k|e| |a| |c|h|o|i|c|e| |f|r|o|m| |t|h|e| |l|i|s|t| |╗| +0#0000000#ffffff0@21 |4| @20|║+0#0000001#ffd7ff255| |o|n|e| @24|║| +0#0000000#ffffff0@21 |5| @20|║+0#0000001#ffd7ff255| |t|w|o| @24|║| +0#0000000#ffffff0@21 -|6| @20|║+0#0000001#ffd7ff255| |a+0#0000000#5fd7ff255|n|o|t|h|e|r| +0#0000001&@19| +0&#ffd7ff255|║| +0#0000000#ffffff0@21 +|6| @20|║+0#0000001#ffd7ff255| |a+0fd7ff255|n|o|t|h|e|r| @19| +0&#ffd7ff255|║| +0#0000000#ffffff0@21 |7| @20|╚+0#0000001#ffd7ff255|═@28|╝| +0#0000000#ffffff0@21 |8| @73 |9| @73 diff --git a/src/testdir/dumps/Test_popupwin_menu_04.dump b/src/testdir/dumps/Test_popupwin_menu_04.dump index 30706a76cd..2ee61fc247 100644 --- a/src/testdir/dumps/Test_popupwin_menu_04.dump +++ b/src/testdir/dumps/Test_popupwin_menu_04.dump @@ -1,7 +1,7 @@ >1+0&#ffffff0| @73 |2| @73 |3| @31|╔+0#0000001#ffd7ff255|═@6|╗| +0#0000000#ffffff0@32 -|4| @31|║+0#0000001#ffd7ff255| |o+0#0000000#40ff4011|n|e| +0#0000001&@1| +0&#ffd7ff255|║| +0#0000000#ffffff0@32 +|4| @31|║+0#0000001#ffd7ff255| |o+0(ff4011|n|e| @1| +0&#ffd7ff255|║| +0#0000000#ffffff0@32 |5| @31|║+0#0000001#ffd7ff255| |t|w|o| @2|║| +0#0000000#ffffff0@32 |6| @31|║+0#0000001#ffd7ff255| |t|h|r|e@1| |║| +0#0000000#ffffff0@32 |7| @31|╚+0#0000001#ffd7ff255|═@6|╝| +0#0000000#ffffff0@32 |