diff --git a/src/testdir/test_display.vim b/src/testdir/test_display.vim
index 4ef361e..199a25f 100644
--- a/src/testdir/test_display.vim
+++ b/src/testdir/test_display.vim
@@ -186,7 +186,7 @@
 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 cddf770..2ab2e07 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    6,
+/**/
     5,
 /**/
     4,