From dcd71cbaedf75dd8e5c5a45c5c2e3ec7ee552dce Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 4 Nov 2018 14:40:47 +0100 Subject: patch 8.1.0510: filter test fails when $LANG is C.UTF-8 Problem: Filter test fails when $LANG is C.UTF-8. Solution: Set 'helplang' to "en" for any C language. (Christian Brabandt, closes #3577) --- src/option.c | 8 +++++++- src/version.c | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) 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 @@ -792,6 +792,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 510, /**/ 509, /**/ -- cgit v1.2.1