diff options
| author | Bram Moolenaar <Bram@vim.org> | 2023-01-28 20:57:59 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2023-01-28 20:57:59 +0000 |
| commit | 492324e58840f441d7226e7656844e778e65d7fb (patch) | |
| tree | 7fefd8b245f766eaa0f7e769491377381dafe278 | |
| parent | 755bf2b3d265ceb9c02752d4286a055e44f9ce29 (diff) | |
patch 9.0.1259: diffmode test failsv9.0.1259
Problem: Diffmode test fails.
Solution: Adjust expected result for adjusted indenting.
| -rw-r--r-- | src/testdir/dumps/Test_diff_syntax_1.dump | 18 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/testdir/dumps/Test_diff_syntax_1.dump b/src/testdir/dumps/Test_diff_syntax_1.dump index 9204b47ab9..c96793afa6 100644 --- a/src/testdir/dumps/Test_diff_syntax_1.dump +++ b/src/testdir/dumps/Test_diff_syntax_1.dump @@ -1,20 +1,20 @@ | +0#0000e05#a8a8a8255@1>v+0#00e0003#ffd7ff255|o|i|d| +0#0000000&|d|o|S+2&#ff404010|o|m|e|t+0&#ffd7ff255|h|i|n|g|(|)| |{| @52 -| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@10|i+0#00e0003&|n|t| +0#0000000&|x| |=| |0+0#e000002&|;+0#0000000&| @51 -| +0#0000e05#a8a8a8255@1| +0#0000000#ffd7ff255@10|c+0#00e0003&|h|a|r| +0#0000000&|*|s| |=| |"+0#e000002&|t+2&#ff404010|h|e|r|e|"+0&#ffd7ff255|;+0#0000000&| @43 -| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@10|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|5+0#e000002&|;+0#0000000&| @52 -| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@7|}| @63 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@2|i+0#00e0003&|n|t| +0#0000000&|x| |=| |0+0#e000002&|;+0#0000000&| @59 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffd7ff255@2|c+0#00e0003&|h|a|r| +0#0000000&|*|s| |=| |"+0#e000002&|t+2&#ff404010|h|e|r|e|"+0&#ffd7ff255|;+0#0000000&| @51 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|5+0#e000002&|;+0#0000000&| @60 +| +0#0000e05#a8a8a8255@1|}+0#0000000#ffffff0| @71 |~+0#4040ff13&| @73 |~| @73 |~| @73 |~| @73 |X+3#0000000&|p|r|o|g|r|a|m|2|.|c| @45|1|,|1| @11|A|l@1 | +0#0000e05#a8a8a8255@1|v+0#00e0003#ffd7ff255|o|i|d| +0#0000000&|d|o|N+2&#ff404010|o|t+0&#ffd7ff255|h|i|n|g|(|)| |{| @54 -| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@10|i+0#00e0003&|n|t| +0#0000000&|x| |=| |0+0#e000002&|;+0#0000000&| @51 -| +0#0000e05#a8a8a8255@1| +0#0000000#ffd7ff255@10|c+0#00e0003&|h|a|r| +0#0000000&|*|s| |=| |"+0#e000002&|h+2&#ff404010|e|l@1|o|"+0&#ffd7ff255|;+0#0000000&| @43 -| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@10|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|5+0#e000002&|;+0#0000000&| @52 -| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@7|}| @63 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@2|i+0#00e0003&|n|t| +0#0000000&|x| |=| |0+0#e000002&|;+0#0000000&| @59 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffd7ff255@2|c+0#00e0003&|h|a|r| +0#0000000&|*|s| |=| |"+0#e000002&|h+2&#ff404010|e|l@1|o|"+0&#ffd7ff255|;+0#0000000&| @51 +| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|5+0#e000002&|;+0#0000000&| @60 +| +0#0000e05#a8a8a8255@1|}+0#0000000#ffffff0| @71 |~+0#4040ff13&| @73 |~| @73 |~| @73 |X+1#0000000&|p|r|o|g|r|a|m|1|.|c| @45|1|,|1| @11|A|l@1 -|"+0&&|X|p|r|o|g|r|a|m|2|.|c|"| |5|L|,| |7|6|B| @53 +|"+0&&|X|p|r|o|g|r|a|m|2|.|c|"| |5|L|,| |7|2|B| @53 diff --git a/src/version.c b/src/version.c index 0cc20ca3bf..85fbc40c55 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1259, +/**/ 1258, /**/ 1257, |