From 6e43b30a854d9aca451a794d368443b90f259a7e Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 14 Dec 2019 17:53:27 +0100
Subject: [PATCH] patch 8.2.0006: test using long file name may fail

Problem:    Test using long file name may fail. (Vladimir Lomov)
Solution:   Limit the name length. (Christian Brabandt, closes #5358)
---
 src/testdir/test_display.vim | 2 +-
 src/version.c                | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/testdir/test_display.vim b/src/testdir/test_display.vim
index 4ef361e05..199a25f1f 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 cddf7704b..2ab2e074f 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,
 /**/
-- 
2.50.1