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 #4112)

diff --git a/runtime/tutor/tutor.vim b/runtime/tutor/tutor.vim
index f450e773dab1732343b909112fdc7f4b7b0f96b8..9517f6942b637c255291a2d7f705ebc73ba32b99 100644 (file)
--- 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 33616854acf89e62553d11a69ac6dcb791280188..21152b0ec1f927e7e9cd9fa997ac707838678b8d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -775,6 +775,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1089,
 /**/
     1088,
 /**/