aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-12 06:44:06 -04:00
Code Activity

patch 8.1.1144: too strict checking of the 'spellfile' option

Browse Source 
Problem:    Too strict checking of the 'spellfile' option.
Solution:   Allow for a path.
This commit is contained in:
Bram Moolenaar
2019-04-10 22:33:41 +02:00
parent 8f130eda47
commit 862f1e17ea
3 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/option.c
View File

@@ -6039,6 +6039,20 @@ valid_spellang(char_u *val)
return valid_name(val, ".-_,");
}
/*
* Return TRUE if "val" is a valid 'spellfile' value.
*/
static int
valid_spellfile(char_u *val)
{
char_u *s;
for (s = val; *s != NUL; ++s)
if (!vim_isfilec(*s) && *s != ',')
return FALSE;
return TRUE;
}
/*
* Handle string options that need some action to perform when changed.
* Returns NULL for success, or an error message for an error.
@@ -7101,10 +7115,13 @@ did_set_string_option(
else if (varp == &(curwin->w_s->b_p_spl)
|| varp == &(curwin->w_s->b_p_spf))
{
if (!valid_spellang(*varp))
int is_spellfile = varp == &(curwin->w_s->b_p_spf);
if ((is_spellfile && !valid_spellfile(*varp))
|| (!is_spellfile && !valid_spellang(*varp)))
errmsg = e_invarg;
else
errmsg = did_set_spell_option(varp == &(curwin->w_s->b_p_spf));
errmsg = did_set_spell_option(is_spellfile);
}
/* When 'spellcapcheck' is set compile the regexp program. */
else if (varp == &(curwin->w_s->b_p_spc))