diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-03-30 19:56:46 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-03-30 19:56:46 +0100 |
| commit | b44b7add8ae8e15328b4f68c3caf511bd9aaac8c (patch) | |
| tree | 5576e3cd4b3d28e2d19e91a6f62a70419f331b4a | |
| parent | 9e1e358d376284c3aaf3a9f1e568bca297405f62 (diff) | |
| download | vim-git-b44b7add8ae8e15328b4f68c3caf511bd9aaac8c.tar.gz | |
patch 8.1.1089: tutor does not check $LC_MESSAGESv8.1.1089
Problem: Tutor does not check $LC_MESSAGES.
Solution: Let $LC_MESSAGES overrule $LANG. (Miklos Vajna, closes #4112)
| -rw-r--r-- | runtime/tutor/tutor.vim | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/runtime/tutor/tutor.vim b/runtime/tutor/tutor.vim index f450e773d..9517f6942 100644 --- a/runtime/tutor/tutor.vim +++ b/runtime/tutor/tutor.vim @@ -1,7 +1,7 @@ " Vim tutor support file " Author: Eduardo F. Amatria <eferna1@platea.pntic.mec.es> " Maintainer: Bram Moolenaar -" Last Change: 2018 Apr 11 +" Last Change: 2019 Mar 30 " This Vim script is used for detecting if a translation of the " tutor file exist, i.e., a tutor.xx file, where xx is the language. @@ -22,6 +22,12 @@ else let s:lang = v:lang elseif $LC_ALL =~ '\a\a' let s:lang = $LC_ALL + elseif $LC_MESSAGES =~ '\a\a' || $LC_MESSAGES ==# "C" + " LC_MESSAGES=C can be used to explicitly ask for English messages while + " keeping LANG non-English; don't set s:lang then. + if $LC_MESSAGES =~ '\a\a' + let s:lang = $LC_MESSAGES + endif elseif $LANG =~ '\a\a' let s:lang = $LANG endif diff --git a/src/version.c b/src/version.c index 33616854a..21152b0ec 100644 --- a/src/version.c +++ b/src/version.c @@ -776,6 +776,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1089, +/**/ 1088, /**/ 1087, |