From 6a950a6007f27d9d0ce32ef8dcaf5c9d0f1b5aab Mon Sep 17 00:00:00 2001
From: Dominique Pelle <dominique.pelle@gmail.com>
Date: Sat, 13 Nov 2021 18:44:37 +0000
Subject: [PATCH] patch 8.2.3592: Test_hlset fails when terminal has many
 columns
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Problem:    Test_hlset fails when terminal has many columns.
Solution:   Set the number of columns to 80. (Dominique Pellé, closes #9101,
            closes #9100)
---
 src/testdir/test_highlight.vim | 5 +++++
 src/version.c                  | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/src/testdir/test_highlight.vim b/src/testdir/test_highlight.vim
index 51fd4145f..bc0611891 100644
--- a/src/testdir/test_highlight.vim
+++ b/src/testdir/test_highlight.vim
@@ -1046,6 +1046,9 @@ endfunc
 
 " Test for the hlset() function
 func Test_hlset()
+  let save_columns = &columns
+  let &columns = 80
+
   let lines =<< trim END
     call assert_equal(0, hlset(test_null_list()))
     call assert_equal(0, hlset([]))
@@ -1150,6 +1153,8 @@ func Test_hlset()
                       \ 'term': attr, 'cterm': attr}], hlget('myhlg2'))
   END
   call CheckLegacyAndVim9Success(lines)
+
+  let &columns = save_columns
 endfunc
 
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index ca022bf8b..c0acd4b67 100644
--- a/src/version.c
+++ b/src/version.c
@@ -757,6 +757,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3592,
 /**/
     3591,
 /**/
-- 
2.40.0