aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/testdir
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2020-01-26 15:53:23 -0800
committerGitHub <noreply@github.com>2020-01-26 15:53:23 -0800
commit9dc3247850d057bca3250f26ca8d0578d6b35455 (patch)
treecfd13e38d2e4503b4194b434b94fa2d6e0646d2e /src/nvim/testdir
parent6f073ccbf464e2f2cd6d6855aa3f27ee1adcc20d (diff)
parentad272cd2d7ac6c9d28c2981169b779e146cbb5d6 (diff)
downloadrneovim-9dc3247850d057bca3250f26ca8d0578d6b35455.tar.gz
rneovim-9dc3247850d057bca3250f26ca8d0578d6b35455.tar.bz2
rneovim-9dc3247850d057bca3250f26ca8d0578d6b35455.zip
Merge #11766 from janlazo/vim-8.1.1143
vim-patch:8.1.{1143,1144}
Diffstat (limited to 'src/nvim/testdir')
-rw-r--r--src/nvim/testdir/test_escaped_glob.vim2
-rw-r--r--src/nvim/testdir/test_spell.vim11
2 files changed, 12 insertions, 1 deletions
diff --git a/src/nvim/testdir/test_escaped_glob.vim b/src/nvim/testdir/test_escaped_glob.vim
index aad3a1e835..2bfd82c296 100644
--- a/src/nvim/testdir/test_escaped_glob.vim
+++ b/src/nvim/testdir/test_escaped_glob.vim
@@ -17,7 +17,7 @@ function Test_glob()
" Setting 'shell' to an invalid name causes a memory leak.
sandbox call assert_equal("", glob('Xxx\{'))
sandbox call assert_equal("", glob('Xxx\$'))
- w! Xxx{
+ w! Xxx\{
" } to fix highlighting
w! Xxx\$
sandbox call assert_equal("Xxx{", glob('Xxx\{'))
diff --git a/src/nvim/testdir/test_spell.vim b/src/nvim/testdir/test_spell.vim
index e2016d7927..94789d6ea3 100644
--- a/src/nvim/testdir/test_spell.vim
+++ b/src/nvim/testdir/test_spell.vim
@@ -151,6 +151,12 @@ func Test_spellinfo()
set nospell spelllang=en
call assert_fails('spellinfo', 'E756:')
+ call assert_fails('set spelllang=foo/bar', 'E474:')
+ call assert_fails('set spelllang=foo\ bar', 'E474:')
+ call assert_fails("set spelllang=foo\\\nbar", 'E474:')
+ call assert_fails("set spelllang=foo\\\rbar", 'E474:')
+ call assert_fails("set spelllang=foo+bar", 'E474:')
+
set enc& spell& spelllang&
bwipe
endfunc
@@ -386,6 +392,11 @@ func Test_zz_sal_and_addition()
call assert_equal("elekwint", SecondSpellWord())
endfunc
+func Test_spellfile_value()
+ set spellfile=Xdir/Xtest.latin1.add
+ set spellfile=Xdir/Xtest.utf-8.add,Xtest_other.add
+endfunc
+
func Test_region_error()
messages clear
call writefile(["/regions=usgbnz", "elequint/0"], "Xtest.latin1.add")