mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-18 17:28:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-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.
862f1e17ea
This commit is contained in:
Jan Edmund Lazo
2020-01-26 10:21:28 -05:00
parent 08c5a874ab
commit ad272cd2d7
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/nvim/option.c
View File

@@ -2538,6 +2538,18 @@ bool valid_spellang(const char_u *val)
return valid_name(val, ".-_,"); return valid_name(val, ".-_,");
} }
/// Return true if "val" is a valid 'spellfile' value.
static bool valid_spellfile(const char_u *val)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT
{
for (const char_u *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. /// Handle string options that need some action to perform when changed.
/// Returns NULL for success, or an error message for an error. /// Returns NULL for success, or an error message for an error.
static char_u * static char_u *
@@ -3049,10 +3061,13 @@ ambw_end:
|| varp == &(curwin->w_s->b_p_spf)) { || varp == &(curwin->w_s->b_p_spf)) {
// When 'spelllang' or 'spellfile' is set and there is a window for this // When 'spelllang' or 'spellfile' is set and there is a window for this
// buffer in which 'spell' is set load the wordlists. // buffer in which 'spell' is set load the wordlists.
if (!valid_spellang(*varp)) { const bool is_spellfile = varp == &(curwin->w_s->b_p_spf);
if ((is_spellfile && !valid_spellfile(*varp))
|| (!is_spellfile && !valid_spellang(*varp))) {
errmsg = e_invarg; errmsg = e_invarg;
} else { } else {
errmsg = did_set_spell_option(varp == &(curwin->w_s->b_p_spf)); errmsg = did_set_spell_option(is_spellfile);
} }
} else if (varp == &(curwin->w_s->b_p_spc)) { } else if (varp == &(curwin->w_s->b_p_spc)) {
// When 'spellcapcheck' is set compile the regexp program. // When 'spellcapcheck' is set compile the regexp program.

5
src/nvim/testdir/test_spell.vim
View File

@@ -392,6 +392,11 @@ func Test_zz_sal_and_addition()
call assert_equal("elekwint", SecondSpellWord()) call assert_equal("elekwint", SecondSpellWord())
endfunc 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() func Test_region_error()
messages clear messages clear
call writefile(["/regions=usgbnz", "elequint/0"], "Xtest.latin1.add") call writefile(["/regions=usgbnz", "elequint/0"], "Xtest.latin1.add")