diff --git a/src/testdir/test_display.vim b/src/testdir/test_display.vim
index 4ef361e05b..199a25f1f5 100644
--- a/src/testdir/test_display.vim
+++ b/src/testdir/test_display.vim
@@ -186,7 +186,7 @@ endfunc
 func Test_edit_long_file_name()
   CheckScreendump
 
-  let longName = 'x'->repeat(&columns)
+  let longName = 'x'->repeat(min([&columns, 255]))
   call writefile([], longName)
   let buf = RunVimInTerminal('-N -u NONE ' .. longName, #{rows: 8})
 
diff --git a/src/version.c b/src/version.c
index cddf7704b0..2ab2e074f1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    6,
 /**/
     5,
 /**/