changeset 16168:7688bff96a8c v8.1.1089

patch 8.1.1089: tutor does not check $LC_MESSAGES commit https://github.com/vim/vim/commit/b44b7add8ae8e15328b4f68c3caf511bd9aaac8c Author: Bram Moolenaar <Bram@vim.org> Date: Sat Mar 30 19:56:46 2019 +0100 patch 8.1.1089: tutor does not check $LC_MESSAGES Problem: Tutor does not check $LC_MESSAGES. Solution: Let $LC_MESSAGES overrule $LANG. (Miklos Vajna, closes https://github.com/vim/vim/issues/4112)
author Bram Moolenaar <Bram@vim.org>
date Sat, 30 Mar 2019 20:00:06 +0100
parents ff925d952c91
children ee589ab1fc15
files runtime/tutor/tutor.vim src/version.c
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,