Permalink
Browse files

patch 8.0.0104

Problem:    Value of 'thesaurus' option not checked properly.
Solution:   Add P_NDNAME flag. (Daisuke Suzuki)
  • Loading branch information...
1 parent 8a8199e commit f422bcc7f9615fe91fa69b059cfe4785093d3d4a @brammool brammool committed Nov 26, 2016
Showing with 21 additions and 11 deletions.
  1. +1 −1 src/option.c
  2. +18 −10 src/testdir/test_options.vim
  3. +2 −0 src/version.c
View
@@ -2660,7 +2660,7 @@ static struct vimoption options[] =
{"textwidth", "tw", P_NUM|P_VI_DEF|P_VIM|P_RBUF,
(char_u *)&p_tw, PV_TW,
{(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
- {"thesaurus", "tsr", P_STRING|P_EXPAND|P_VI_DEF|P_ONECOMMA|P_NODUP,
+ {"thesaurus", "tsr", P_STRING|P_EXPAND|P_VI_DEF|P_ONECOMMA|P_NODUP|P_NDNAME,
#ifdef FEAT_INS_EXPAND
(char_u *)&p_tsr, PV_TSR,
#else
@@ -107,17 +107,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
View
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 104,
+/**/
103,
/**/
102,

0 comments on commit f422bcc

Please sign in to comment.