patch 8.2.0305: relativenumber test fails on some systems

Problem:    Relativenumber test fails on some systems. (James McCoy)
Solution:   Clear the command line.

diff --git a/src/testdir/dumps/Test_relnr_colors_2.dump b/src/testdir/dumps/Test_relnr_colors_2.dump
index 0e80fc61fda496d9daf7dfeaf4b1d254ead9a529..e9de7fa8ba4aeb4a5262124ab2270d1ea2bff578 100644 (file)
--- 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 f54a5befc8934b14880d5449f977d5a95a8d7b47..65f637afa0b181d3f5f8d642868aa2ee3793b67a 100644 (file)
--- 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 54175851361e83045dffeed66498d5fb03161936..fef187bf901b6460514b27b1a3d0bab7bd2d6494 100644 (file)
--- 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 ce3702d8381d36ee4fb1df4d8d256cb910473d36..2c4f78b42c9635393348059c7a1bfc9527b3bba9 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    305,
 /**/
     304,
 /**/