diff --git a/src/testdir/test_highlight.vim b/src/testdir/test_highlight.vim
index 51fd414..bc06118 100644
--- a/src/testdir/test_highlight.vim
+++ b/src/testdir/test_highlight.vim
@@ -1046,6 +1046,9 @@
 
 " 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 @@
                       \ '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 ca022bf..c0acd4b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3592,
+/**/
     3591,
 /**/
     3590,