Mercurial > vim

comparison src/testdir/dumps/Test_diff_cuc_03.dump @ 22818:b27601c0d289 v8.2.1957

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1957: diff and cursorcolumn highlighting don't mix Commit: https://github.com/vim/vim/commit/fabc3ca896751277f18a3a68e5661179728db3ad Author: Bram Moolenaar <Bram@vim.org> Date: Thu Nov 5 19:07:21 2020 +0100 patch 8.2.1957: diff and cursorcolumn highlighting don't mix Problem: Diff and cursorcolumn highlighting don't mix. Solution: Fix condition for what attribute to use. (Christian Brabandt, closes #7258, closes #7260)
author Bram Moolenaar <Bram@vim.org>
date Thu, 05 Nov 2020 19:15:03 +0100
parents
children
comparison
equal deleted inserted replaced
22817:a5f9d3b1b09b 22818:b27601c0d289
1 |a+0&#e0e0e08|a+0&#ffffff0| @34||+1&&| +0#0000e05#a8a8a8255@1|a+0#0000000#ffffff0@1| @32
2 |-+0#4040ff13#afffff255@36||+1#0000000#ffffff0| +0#0000e05#a8a8a8255@1|b+0#0000000#5fd7ff255@1| @32
3 >c+0&#ffffff0@1| @34||+1&&| +0#0000e05#a8a8a8255@1|c+0#0000000#ffffff0@1| @32
4 |~+0#4040ff13&| @35||+1#0000000&|~+0#4040ff13&| @35
5 |~| @35||+1#0000000&|~+0#4040ff13&| @35
6 |~| @35||+1#0000000&|~+0#4040ff13&| @35
7 |~| @35||+1#0000000&|~+0#4040ff13&| @35
8 |~| @35||+1#0000000&|~+0#4040ff13&| @35
9 |~| @35||+1#0000000&|~+0#4040ff13&| @35
10 |~| @35||+1#0000000&|~+0#4040ff13&| @35
11 |~| @35||+1#0000000&|~+0#4040ff13&| @35
12 |~| @35||+1#0000000&|~+0#4040ff13&| @35
13 |~| @35||+1#0000000&|~+0#4040ff13&| @35
14 |~| @35||+1#0000000&|~+0#4040ff13&| @35
15 |~| @35||+1#0000000&|~+0#4040ff13&| @35
16 |~| @35||+1#0000000&|~+0#4040ff13&| @35
17 |~| @35||+1#0000000&|~+0#4040ff13&| @35
18 |~| @35||+1#0000000&|~+0#4040ff13&| @35
19 |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @5|2|,|1| @11|A|l@1| |[+1&&|N|o| |N|a|m|e|]| |[|+|]| @5|3|,|1| @11|A|l@1
20 | +0&&@74