patch 8.1.1279: cannot set 'spellang' to "sr@latin"

Problem:    Cannot set 'spellang' to "sr@latin". (Bojan Stipic)
Solution:   Allow using '@' in 'spellang'. (closes #4342)

diff --git a/src/option.c b/src/option.c
index 9583aa3697de472d43e60977bddb597e8a3e76f5..657c011b1f436cdc57c650695803c847d42f8759 100644 (file)
--- 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 bd3f80ce6c5710cdad0e429eb76180c24c382578..74c725fb8bad604e0c6039fad936f7be253ca872 100644 (file)
--- 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 0b47695ee4dfd964dcffef6938fed30de5e4e3d3..8ab83c363bc1214437d46ff03bd764bc7f8b7f6f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1279,
 /**/
     1278,
 /**/