Attached patch fixes typos,
mostly: spellang -> spelllang.
Regards
Dominique
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/CAON-T_iZwA%3D_mCYeajsumYtX82fbzqJ-eG7nGDChxq5baMAwcg%40mail.gmail.com.
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 9f9ae9491..1371bb0a6 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5232,7 +5232,7 @@ A jump table for the options with a short description can be found at |Q_op|.
< If your terminal can't overrule the mouse events going to the
application, use: >
:set mouse=nvi
-< The you can press ":", select text for the system, and press Esc to go
+< Then you can press ":", select text for the system, and press Esc to go
back to Vim using the mouse events.
In |defaults.vim| "nvi" is used if the 'term' option is not matching
"xterm".
diff --git a/runtime/doc/version8.txt b/runtime/doc/version8.txt
index 2946d6cf1..10a8863b9 100644
--- a/runtime/doc/version8.txt
+++ b/runtime/doc/version8.txt
@@ -33684,8 +33684,8 @@ Solution: Also change the textprop implementation.
Files: src/textprop.c
Patch 8.1.1279
-Problem: Cannot set 'spellang' to "sr@latin". (Bojan Stipic)
-Solution: Allow using '@' in 'spellang'. (closes #4342)
+Problem: Cannot set 'spelllang' to "sr@latin". (Bojan Stipic)
+Solution: Allow using '@' in 'spelllang'. (closes #4342)
Files: src/option.c, src/testdir/gen_opt_test.vim
Patch 8.1.1280
diff --git a/runtime/menu.vim b/runtime/menu.vim
index 8400180aa..60e956c08 100644
--- a/runtime/menu.vim
+++ b/runtime/menu.vim
@@ -453,12 +453,12 @@ if has("spell")
an 40.335.260 &Tools.&Spelling.Set\ Language\ to\ "en_us" :set spl=en_us spell<CR>
an <silent> 40.335.270 &Tools.&Spelling.&Find\ More\ Languages :call <SID>SpellLang()<CR>
- let s:undo_spellang = ['aun &Tools.&Spelling.&Find\ More\ Languages']
+ let s:undo_spelllang = ['aun &Tools.&Spelling.&Find\ More\ Languages']
func s:SpellLang()
- for cmd in s:undo_spellang
+ for cmd in s:undo_spelllang
exe "silent! " . cmd
endfor
- let s:undo_spellang = []
+ let s:undo_spelllang = []
if &enc == "iso-8859-15"
let enc = "latin1"
@@ -481,7 +481,7 @@ if has("spell")
let found += 1
let menuname = '&Tools.&Spelling.' . escape(g:menutrans_set_lang_to, "\\. \t|") . '\ "' . nm . '"'
exe 'an 40.335.' . n . ' ' . menuname . ' :set spl=' . nm . ' spell<CR>'
- let s:undo_spellang += ['aun ' . menuname]
+ let s:undo_spelllang += ['aun ' . menuname]
endif
let n += 10
endfor
diff --git a/src/optionstr.c b/src/optionstr.c
index ddb6c50f3..6071f46ed 100644
--- a/src/optionstr.c
+++ b/src/optionstr.c
@@ -1704,7 +1704,7 @@ did_set_string_option(
int is_spellfile = varp == &(curwin->w_s->b_p_spf);
if ((is_spellfile && !valid_spellfile(*varp))
- || (!is_spellfile && !valid_spellang(*varp)))
+ || (!is_spellfile && !valid_spelllang(*varp)))
errmsg = e_invarg;
else
errmsg = did_set_spell_option(is_spellfile);
diff --git a/src/proto/spell.pro b/src/proto/spell.pro
index 461b5e10e..6b1f84bc3 100644
--- a/src/proto/spell.pro
+++ b/src/proto/spell.pro
@@ -43,7 +43,7 @@ char_u *spell_to_word_end(char_u *start, win_T *win);
int spell_word_start(int startcol);
void spell_expand_check_cap(colnr_T col);
int expand_spelling(linenr_T lnum, char_u *pat, char_u ***matchp);
-int valid_spellang(char_u *val);
+int valid_spelllang(char_u *val);
int valid_spellfile(char_u *val);
char *did_set_spell_option(int is_spellfile);
char *compile_cap_prog(synblock_T *synblock);
diff --git a/src/spell.c b/src/spell.c
index 20826f3fe..cdb8e2ff0 100644
--- a/src/spell.c
+++ b/src/spell.c
@@ -2002,7 +2002,7 @@ did_set_spelllang(win_T *wp)
region = NULL;
len = (int)STRLEN(lang);
- if (!valid_spellang(lang))
+ if (!valid_spelllang(lang))
continue;
if (STRCMP(lang, "cjk") == 0)
@@ -4303,10 +4303,10 @@ expand_spelling(
}
/*
- * Return TRUE if "val" is a valid 'spellang' value.
+ * Return TRUE if "val" is a valid 'spelllang' value.
*/
int
-valid_spellang(char_u *val)
+valid_spelllang(char_u *val)
{
return valid_name(val, ".-_,@");
}
