summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWuerfelDev <dev@wuerfeldev.de>2023-02-10 20:49:08 +0000
committerBram Moolenaar <Bram@vim.org>2023-02-10 20:49:08 +0000
commit962d91643520ec3748fcf5af3263d89ccfcdda92 (patch)
tree4add2fcda1cd96bf37351e1cc6e1fe8eefb1347b
parent094cf9f4d588b1c29f4e35c4ccbf8505510569fb (diff)
patch 9.0.1297: wrong value for $LC_CTYPE makes the environ test failv9.0.1297
Problem: Wrong value for $LC_CTYPE makes the environ test fail. Solution: Unset $LC_CTYPE when running tests. (closes #11963)
-rw-r--r--src/testdir/test_environ.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_environ.vim b/src/testdir/test_environ.vim
index d8344817f5..b5dbdce104 100644
--- 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 421380030e..26b4048210 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1297,
+/**/
1296,
/**/
1295,