patch 9.0.1297: wrong value for $LC_CTYPE makes the environ test fail

Problem:    Wrong value for $LC_CTYPE makes the environ test fail.
Solution:   Unset $LC_CTYPE when running tests. (closes #11963)

diff --git a/src/testdir/test_environ.vim b/src/testdir/test_environ.vim
index d8344817f5accf9e3a35c17e9ac316db1eeb29bd..b5dbdce10441eb0695f4cf8f4d1b772a37cd01df 100644 (file)
--- a/src/testdir/test_environ.vim
+++ b/src/testdir/test_environ.vim
@@ -73,7 +73,7 @@ func Test_mac_locale()
   " If $LANG is not set then the system locale will be used.
   " Run Vim after unsetting all the locale environmental vars, and capture the
   " output of :lang.
-  let lang_results = system("unset LANG; unset LC_MESSAGES; " ..
+  let lang_results = system("unset LANG; unset LC_MESSAGES; unset LC_CTYPE; " ..
             \ shellescape(v:progpath) ..
             \ " --clean -esX -c 'redir @a' -c 'lang' -c 'put a' -c 'print' -c 'qa!' ")
 

diff --git a/src/version.c b/src/version.c
index 421380030e31b314628b089a4f16ee127e109559..26b4048210130bd8fcf6897e8b328ccb28b4423c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1297,
 /**/
     1296,
 /**/