Mercurial > vim
annotate src/testdir/dumps/Test_diff_13.dump @ 22013:125051dff419 v8.2.1556
patch 8.2.1556: cursorline highlighting always overrules sign highlighting
Commit: https://github.com/vim/vim/commit/39f7aa3c3124065b50f182b1d2f7ac92a0918656
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Aug 31 22:00:05 2020 +0200
patch 8.2.1556: cursorline highlighting always overrules sign highlighting
Problem: Cursorline highlighting always overrules sign highlighting.
Solution: Combine the highlighting, use the priority to decide how.
(closes #6812)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 31 Aug 2020 22:15:09 +0200 |
parents | dc0801e374e0 |
children | 98f5a0618a77 |
rev | line source |
---|---|
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
1 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@34||+1&&|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@34 |
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
14696
diff
changeset
|
2 |~+0#4040ff13&| @35||+1#0000000&|~+0#4040ff13&| @35 |
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
14696
diff
changeset
|
3 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
14696
diff
changeset
|
4 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
14696
diff
changeset
|
5 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
14696
diff
changeset
|
6 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
14696
diff
changeset
|
7 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
14696
diff
changeset
|
8 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
14696
diff
changeset
|
9 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
14696
diff
changeset
|
10 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
14696
diff
changeset
|
11 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
14696
diff
changeset
|
12 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
14696
diff
changeset
|
13 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
14696
diff
changeset
|
14 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
14696
diff
changeset
|
15 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
14696
diff
changeset
|
16 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
14696
diff
changeset
|
17 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
14696
diff
changeset
|
18 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
19 |X+3#0000000&|f|i|l|e|1| @12|0|,|0|-|1| @9|A|l@1| |X+1&&|f|i|l|e|2| @12|0|,|0|-|1| @9|A|l@1 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
20 |:+0&&> @73 |