summaryrefslogtreecommitdiff
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
commitc3a53d7ba26fecbc2240c557a696d0306260e8b9 (patch)
treec865d633cf8b0d2a121986e09e2bb1e871614e5f
parentb58ec79006851af872ae34ebfbff41604dab43ae (diff)
downloadvim-c3a53d7ba26fecbc2240c557a696d0306260e8b9.tar.gz
updated for version 7.3.1257v7.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 22b41f41..4a860ca8 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 fe0ce589..4980ae57 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,