summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-11-04 14:40:47 +0100
committerBram Moolenaar <Bram@vim.org>2018-11-04 14:40:47 +0100
commitdcd71cbaedf75dd8e5c5a45c5c2e3ec7ee552dce (patch)
tree91ecfec871600e200840c2bf32d06c0e9070c8b6
parent0b38f54730c3f9835ddade01c2263ce0f56c1c0f (diff)
downloadvim-git-dcd71cbaedf75dd8e5c5a45c5c2e3ec7ee552dce.tar.gz
patch 8.1.0510: filter test fails when $LANG is C.UTF-8v8.1.0510
Problem: Filter test fails when $LANG is C.UTF-8. Solution: Set 'helplang' to "en" for any C language. (Christian Brabandt, closes #3577)
-rw-r--r--src/option.c8
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/src/option.c b/src/option.c
index f238abe84..3c54ab642 100644
--- a/src/option.c
+++ b/src/option.c
@@ -4256,12 +4256,18 @@ set_helplang_default(char_u *lang)
p_hlg = empty_option;
else
{
- /* zh_CN becomes "cn", zh_TW becomes "tw". */
+ // zh_CN becomes "cn", zh_TW becomes "tw"
if (STRNICMP(p_hlg, "zh_", 3) == 0 && STRLEN(p_hlg) >= 5)
{
p_hlg[0] = TOLOWER_ASC(p_hlg[3]);
p_hlg[1] = TOLOWER_ASC(p_hlg[4]);
}
+ // any C like setting, such as C.UTF-8, becomes "en"
+ else if (STRLEN(p_hlg) >= 1 && *p_hlg == 'C')
+ {
+ p_hlg[0] = 'e';
+ p_hlg[1] = 'n';
+ }
p_hlg[2] = NUL;
}
options[idx].flags |= P_ALLOCED;
diff --git a/src/version.c b/src/version.c
index fb8a16dc2..a5b6d877b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -793,6 +793,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 510,
+/**/
509,
/**/
508,