aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/options.lua1
-rw-r--r--src/nvim/testdir/test_options.vim28
-rw-r--r--src/nvim/version.c2
3 files changed, 20 insertions, 11 deletions
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index cce9e10409..8911f72692 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -2451,6 +2451,7 @@ return {
full_name='thesaurus', abbreviation='tsr',
type='string', list='onecomma', scope={'global', 'buffer'},
deny_duplicates=true,
+ normal_dname_chars=true,
vi_def=true,
expand=true,
varname='p_tsr',
diff --git a/src/nvim/testdir/test_options.vim b/src/nvim/testdir/test_options.vim
index ea020d9ca0..0b9c9e6653 100644
--- a/src/nvim/testdir/test_options.vim
+++ b/src/nvim/testdir/test_options.vim
@@ -104,17 +104,25 @@ func Test_keymap_valid()
call assert_fails(":set kmp=trunc\x00name", "trunc")
endfunc
-func Test_dictionary()
+func Check_dir_option(name)
" Check that it's possible to set the option.
- set dictionary=/usr/share/dict/words
- call assert_equal('/usr/share/dict/words', &dictionary)
- set dictionary=/usr/share/dict/words,/and/there
- call assert_equal('/usr/share/dict/words,/and/there', &dictionary)
- set dictionary=/usr/share/dict\ words
- call assert_equal('/usr/share/dict words', &dictionary)
+ exe 'set ' . a:name . '=/usr/share/dict/words'
+ call assert_equal('/usr/share/dict/words', eval('&' . a:name))
+ exe 'set ' . a:name . '=/usr/share/dict/words,/and/there'
+ call assert_equal('/usr/share/dict/words,/and/there', eval('&' . a:name))
+ exe 'set ' . a:name . '=/usr/share/dict\ words'
+ call assert_equal('/usr/share/dict words', eval('&' . a:name))
" Check rejecting weird characters.
- call assert_fails("set dictionary=/not&there", "E474:")
- call assert_fails("set dictionary=/not>there", "E474:")
- call assert_fails("set dictionary=/not.*there", "E474:")
+ call assert_fails("set " . a:name . "=/not&there", "E474:")
+ call assert_fails("set " . a:name . "=/not>there", "E474:")
+ call assert_fails("set " . a:name . "=/not.*there", "E474:")
+endfunc
+
+func Test_dictionary()
+ call Check_dir_option('dictionary')
+endfunc
+
+func Test_thesaurus()
+ call Check_dir_option('thesaurus')
endfunc
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 890587b307..06482bf490 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -848,7 +848,7 @@ static const int included_patches[] = {
// 107 NA
// 106,
// 105 NA
- // 104,
+ 104,
// 103 NA
102,
101,