summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-02-16 21:14:33 +0100
committerBram Moolenaar <Bram@vim.org>2021-02-16 21:14:33 +0100
commit04ea7e9049706788179945e2a91922c0b7cb9ed0 (patch)
tree7a012f5a793a39aba52d6cb997e623889a966cb8
parentb8554304c3673b081e9b5996f009fd0e4307e482 (diff)
downloadvim-git-04ea7e9049706788179945e2a91922c0b7cb9ed0.tar.gz
patch 8.2.2520: missing tests for 'listchars'v8.2.2520
Problem: Missing tests for 'listchars'. Solution: Add a few more checks. (Yegappan Lakshmanan, closes #7854)
-rw-r--r--src/testdir/test_listchars.vim20
-rw-r--r--src/version.c2
2 files changed, 22 insertions, 0 deletions
diff --git a/src/testdir/test_listchars.vim b/src/testdir/test_listchars.vim
index ca47d5283..172407a8d 100644
--- a/src/testdir/test_listchars.vim
+++ b/src/testdir/test_listchars.vim
@@ -336,6 +336,26 @@ func Test_listchars_window_local()
close
call assert_equal(['+------+^^one>>two<<%'], ScreenLines(1, virtcol('$')))
+ " Setting invalid value for a local setting should not impact the local and
+ " global settings
+ split
+ setlocal listchars=tab:<->,lead:_,space:.,trail:@,eol:#
+ let cmd = 'setlocal listchars=tab:{.},lead:-,space:=,trail:#,eol:$,x'
+ call assert_fails(cmd, 'E474:')
+ call assert_equal(['<------>__one..two@@#'], ScreenLines(1, virtcol('$')))
+ close
+ call assert_equal(['+------+^^one>>two<<%'], ScreenLines(1, virtcol('$')))
+
+ " Setting invalid value for a global setting should not impact the local and
+ " global settings
+ split
+ setlocal listchars=tab:<->,lead:_,space:.,trail:@,eol:#
+ let cmd = 'setglobal listchars=tab:{.},lead:-,space:=,trail:#,eol:$,x'
+ call assert_fails(cmd, 'E474:')
+ call assert_equal(['<------>__one..two@@#'], ScreenLines(1, virtcol('$')))
+ close
+ call assert_equal(['+------+^^one>>two<<%'], ScreenLines(1, virtcol('$')))
+
%bw!
set list& listchars&
endfunc
diff --git a/src/version.c b/src/version.c
index 02abac975..c1d89c04c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2520,
+/**/
2519,
/**/
2518,