summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-02-23 13:38:08 +0100
committerBram Moolenaar <Bram@vim.org>2020-02-23 13:38:08 +0100
commit8040a7147f5b896a702d1684e7831df107490f45 (patch)
tree869b44aef997108c12de5b561a5bd10742171f3b
parent95ffd43f88226599728d15cb1b7b272111ea1266 (diff)
patch 8.2.0305: relativenumber test fails on some systemsv8.2.0305
Problem: Relativenumber test fails on some systems. (James McCoy) Solution: Clear the command line.
-rw-r--r--src/testdir/dumps/Test_relnr_colors_2.dump2
-rw-r--r--src/testdir/dumps/Test_relnr_colors_3.dump2
-rw-r--r--src/testdir/test_number.vim4
-rw-r--r--src/version.c2
4 files changed, 6 insertions, 4 deletions
diff --git a/src/testdir/dumps/Test_relnr_colors_2.dump b/src/testdir/dumps/Test_relnr_colors_2.dump
index 0e80fc61fd..e9de7fa8ba 100644
--- a/src/testdir/dumps/Test_relnr_colors_2.dump
+++ b/src/testdir/dumps/Test_relnr_colors_2.dump
@@ -7,4 +7,4 @@
| +0#ff404010&@1|2| |1+0#0000000&@1|2| @42
| +0#ff404010&@1|3| |1+0#0000000&@1|3| @42
| +0#ff404010&@1|4| |1+0#0000000&@1|4| @42
-|:|h|i| |L|i|n|e|N|r|A|b|o|v|e| |c|t|e|r|m|f|g|=|b|l|u|e| @3|1@2|,|1| @8|5@1|%|
+|:| @30|1@2|,|1| @8|5@1|%|
diff --git a/src/testdir/dumps/Test_relnr_colors_3.dump b/src/testdir/dumps/Test_relnr_colors_3.dump
index f54a5befc8..65f637afa0 100644
--- a/src/testdir/dumps/Test_relnr_colors_3.dump
+++ b/src/testdir/dumps/Test_relnr_colors_3.dump
@@ -7,4 +7,4 @@
| +0#40ff4011&@1|2| |1+0#0000000&@1|2| @42
| +0#40ff4011&@1|3| |1+0#0000000&@1|3| @42
| +0#40ff4011&@1|4| |1+0#0000000&@1|4| @42
-|:|h|i| |L|i|n|e|N|r|B|e|l|o|w| |c|t|e|r|m|f|g|=|g|r|e@1|n| @2|1@2|,|1| @8|5@1|%|
+|:| @30|1@2|,|1| @8|5@1|%|
diff --git a/src/testdir/test_number.vim b/src/testdir/test_number.vim
index 5417585136..fef187bf90 100644
--- a/src/testdir/test_number.vim
+++ b/src/testdir/test_number.vim
@@ -284,10 +284,10 @@ func Test_relativenumber_colors()
" Default colors
call VerifyScreenDump(buf, 'Test_relnr_colors_1', {})
- call term_sendkeys(buf, ":hi LineNrAbove ctermfg=blue\<CR>")
+ call term_sendkeys(buf, ":hi LineNrAbove ctermfg=blue\<CR>:\<CR>")
call VerifyScreenDump(buf, 'Test_relnr_colors_2', {})
- call term_sendkeys(buf, ":hi LineNrBelow ctermfg=green\<CR>")
+ call term_sendkeys(buf, ":hi LineNrBelow ctermfg=green\<CR>:\<CR>")
call VerifyScreenDump(buf, 'Test_relnr_colors_3', {})
call term_sendkeys(buf, ":hi clear LineNrAbove\<CR>")
diff --git a/src/version.c b/src/version.c
index ce3702d838..2c4f78b42c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 305,
+/**/
304,
/**/
303,