summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-01-17 13:48:03 +0100
committerBram Moolenaar <Bram@vim.org>2021-01-17 13:48:03 +0100
commit85773bf32b51cbe7e971c5ac11cb9c743bb7a38a (patch)
tree5f57c74790fed36ec73837f02bdc17561ed02dd1
parent239f8d932672bcf5be6d32fc7c0bf95a2e69f5eb (diff)
patch 8.2.2368: insufficient tests for setting optionsv8.2.2368
Problem: Insufficient tests for setting options. Solution: Add a few tests. (Dominique Pellé, closes #7695)
-rw-r--r--src/testdir/test_options.vim19
-rw-r--r--src/version.c2
2 files changed, 20 insertions, 1 deletions
diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim
index 281c20c1f1..cc02c5c7ca 100644
--- a/src/testdir/test_options.vim
+++ b/src/testdir/test_options.vim
@@ -371,8 +371,14 @@ func Test_set_errors()
call assert_fails('set foldmarker=x', 'E536:')
call assert_fails('set commentstring=x', 'E537:')
call assert_fails('set complete=x', 'E539:')
+ call assert_fails('set rulerformat=%-', 'E539:')
+ call assert_fails('set rulerformat=%(', 'E542:')
+ call assert_fails('set rulerformat=%15(%%', 'E542:')
+ call assert_fails('set statusline=%$', 'E539:')
call assert_fails('set statusline=%{', 'E540:')
call assert_fails('set statusline=%(', 'E542:')
+ call assert_fails('set statusline=%)', 'E542:')
+
if has('cursorshape')
" This invalid value for 'guicursor' used to cause Vim to crash.
call assert_fails('set guicursor=i-ci,r-cr:h', 'E545:')
@@ -406,11 +412,22 @@ func Test_set_errors()
call assert_fails('set wildchar=<abc>', 'E474:')
call assert_fails('set cmdheight=1a', 'E521:')
call assert_fails('set invcmdheight', 'E474:')
- if has('python') && has('python3')
+ if has('python') || has('python3')
call assert_fails('set pyxversion=6', 'E474:')
endif
call assert_fails("let &tabstop='ab'", 'E521:')
call assert_fails('set spellcapcheck=%\\(', 'E54:')
+ call assert_fails('set sessionoptions=curdir,sesdir', 'E474:')
+ call assert_fails('set foldmarker={{{,', 'E474:')
+ call assert_fails('set sessionoptions=sesdir,curdir', 'E474:')
+ call assert_fails('set listchars=trail:· ambiwidth=double', 'E834:')
+ set listchars&
+ call assert_fails('set fillchars=stl:· ambiwidth=double', 'E835:')
+ set fillchars&
+ call assert_fails('set fileencoding=latin1,utf-8', 'E474:')
+ set nomodifiable
+ call assert_fails('set fileencoding=latin1', 'E21:')
+ set modifiable&
endfunc
func CheckWasSet(name)
diff --git a/src/version.c b/src/version.c
index e29ae78129..4d36419caf 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 */
/**/
+ 2368,
+/**/
2367,
/**/
2366,