summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-06-28 20:36:30 +0200
committerBram Moolenaar <Bram@vim.org>2013-06-28 20:36:30 +0200
commite3a0b53c2e8985e51174f01ee58f8746ea2c45a9 (patch)
treed6ff3b7b800cb7ee760b9478ec9c76772c7cb916
parentf0327f67c778f46cdf19d793c013f024f01ea818 (diff)
updated for version 7.3.1257v7.3.1257
Problem: With GNU gettext() ":lang de_DE.utf8" does not always result in German messages. Solution: Clear the $LANGUAGE environment variable.
-rw-r--r--src/ex_cmds2.c3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 22b41f415e..4a860ca885 100644
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -4261,6 +4261,9 @@ ex_language(eap)
if (what == LC_ALL)
{
vim_setenv((char_u *)"LANG", name);
+
+ /* Clear $LANGUAGE because GNU gettext uses it. */
+ vim_setenv((char_u *)"LANGUAGE", (char_u *)"");
# ifdef WIN32
/* Apparently MS-Windows printf() may cause a crash when
* we give it 8-bit text while it's expecting text in the
diff --git a/src/version.c b/src/version.c
index fe0ce589bc..4980ae5700 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1257,
+/**/
1256,
/**/
1255,