summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominique Pelle <dominique.pelle@gmail.com>2021-11-13 18:44:37 +0000
committerBram Moolenaar <Bram@vim.org>2021-11-13 18:44:37 +0000
commit6a950a6007f27d9d0ce32ef8dcaf5c9d0f1b5aab (patch)
tree9a6def9cc31a16bd80ccd4fe23f5c8d8cdb7e34e
parent23beefed73aadb243fb67cf944e3d60fe8c038bb (diff)
downloadvim-git-6a950a6007f27d9d0ce32ef8dcaf5c9d0f1b5aab.tar.gz
patch 8.2.3592: Test_hlset fails when terminal has many columnsv8.2.3592
Problem: Test_hlset fails when terminal has many columns. Solution: Set the number of columns to 80. (Dominique Pellé, closes #9101, closes #9100)
-rw-r--r--src/testdir/test_highlight.vim5
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 0 deletions
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
@@ -758,6 +758,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3592,
+/**/
3591,
/**/
3590,