diff options
| author | ckelsel <ckelsel@hotmail.com> | 2017-09-24 12:52:55 +0800 |
|---|---|---|
| committer | ckelsel <ckelsel@hotmail.com> | 2017-09-24 13:07:36 +0800 |
| commit | 172722ec519ab13713856176d2fe39c7716f3b05 (patch) | |
| tree | 26ee578a421c06ead3c5dfa248c2e9cdf23be44e /src | |
| parent | cd13c24427a3191c7383b76a0bf9467bee2736e3 (diff) | |
| parent | 583b68f5a94f362c44ff29c62909969e6908438b (diff) | |
| download | rneovim-172722ec519ab13713856176d2fe39c7716f3b05.tar.gz rneovim-172722ec519ab13713856176d2fe39c7716f3b05.tar.bz2 rneovim-172722ec519ab13713856176d2fe39c7716f3b05.zip | |
vim-patch: 8.0.0104
Problem: Value of 'thesaurus' option not checked properly.
Solution: Add P_NDNAME flag. (Daisuke Suzuki)
https://github.com/vim/vim/commit/f422bcc7f9615fe91fa69b059cfe4785093d3d4a
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/options.lua | 1 | ||||
| -rw-r--r-- | src/nvim/testdir/test_options.vim | 28 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
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, |