summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-05-05 16:55:03 +0200
committerBram Moolenaar <Bram@vim.org>2019-05-05 16:55:03 +0200
commit9a061cb78ccbf78ec9ae454d37a49edccb4e94fc (patch)
treed43d47e13b3ed49c57e6240cfb69d63b56d5d13a
parent58187f1c8a7095dbe0237a8208fa7f7bc899f246 (diff)
patch 8.1.1279: cannot set 'spellang' to "sr@latin"v8.1.1279
Problem: Cannot set 'spellang' to "sr@latin". (Bojan Stipic) Solution: Allow using '@' in 'spellang'. (closes #4342)
-rw-r--r--src/option.c2
-rw-r--r--src/testdir/gen_opt_test.vim1
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 1 deletions
diff --git a/src/option.c b/src/option.c
index 9583aa3697..657c011b1f 100644
--- a/src/option.c
+++ b/src/option.c
@@ -6057,7 +6057,7 @@ valid_filetype(char_u *val)
int
valid_spellang(char_u *val)
{
- return valid_name(val, ".-_,");
+ return valid_name(val, ".-_,@");
}
/*
diff --git a/src/testdir/gen_opt_test.vim b/src/testdir/gen_opt_test.vim
index bd3f80ce6c..74c725fb8b 100644
--- a/src/testdir/gen_opt_test.vim
+++ b/src/testdir/gen_opt_test.vim
@@ -125,6 +125,7 @@ let test_values = {
\ 'sessionoptions': [['', 'blank', 'help,options,slash'], ['xxx']],
\ 'signcolumn': [['', 'auto', 'no'], ['xxx', 'no,yes']],
\ 'spellfile': [['', 'file.en.add'], ['xxx', '/tmp/file']],
+ \ 'spelllang': [['', 'xxx', 'sr@latin'], ['not&lang', "that\\\rthere"]],
\ 'spellsuggest': [['', 'best', 'double,33'], ['xxx']],
\ 'switchbuf': [['', 'useopen', 'split,newtab'], ['xxx']],
\ 'tagcase': [['smart', 'match'], ['', 'xxx', 'smart,match']],
diff --git a/src/version.c b/src/version.c
index 0b47695ee4..8ab83c363b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1279,
+/**/
1278,
/**/
1277,