updated for version 7.3.1257

Problem:    With GNU gettext() ":lang de_DE.utf8" does not always result in
            German messages.
Solution:   Clear the $LANGUAGE environment variable.

diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 22b41f415e63550c26431cf752cb8a6898f0232a..4a860ca885d9b6d3c3343f5c877ee12b3ddc10cb 100644 (file)
--- 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 fe0ce589bc63f7a36d54e92c468363833ed6ff26..4980ae5700d767c91f6cfb99963bdd381a135aa3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1257,
 /**/
     1256,
 /**/