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 @@ -695,6 +695,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1297, /**/ 1296, /**/