thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.0512: 'helplang' default is inconsistent for C and C.UTF-8

Browse Source 
Problem:    'helplang' default is inconsistent for C and C.UTF-8.
Solution:   Don't accept a value unless it starts with two letters.
This commit is contained in:
Bram Moolenaar
2018-11-05 20:25:52 +01:00
parent 9e353b5265
commit 389ab7122b
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ex_cmds2.c
View File

@@ -5358,6 +5358,16 @@ gettext_lang(char_u *name)
#endif
#if defined(FEAT_MULTI_LANG) || defined(PROTO)
/*
* Return TRUE when "lang" starts with a valid language name.
* Rejects NULL, empty string, "C", "C.UTF-8" and others.
*/
static int
is_valid_mess_lang(char_u *lang)
{
return lang != NULL && ASCII_ISALPHA(lang[0]) && ASCII_ISALPHA(lang[1]);
}
/*
* Obtain the current messages language. Used to set the default for
* 'helplang'. May return NULL or an empty string.
@@ -5379,17 +5389,17 @@ get_mess_lang(void)
# endif
# else
p = mch_getenv((char_u *)"LC_ALL");
if (p == NULL || *p == NUL)
if (!is_valid_mess_lang(p))
{
p = mch_getenv((char_u *)"LC_MESSAGES");
if (p == NULL || *p == NUL)
if (!is_valid_mess_lang(p))
p = mch_getenv((char_u *)"LANG");
}
# endif
# ifdef WIN32
p = gettext_lang(p);
# endif
return p;
return is_valid_mess_lang(p) ? p : NULL;
}
#endif