From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 29 Feb 2012 12:49:09 +0000 (+0100)
Subject: updated for version 7.3.457
X-Git-Tag: v7.3.457
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=011a34d77da520b383712dd92b4e63c5fc52d969;p=vim

updated for version 7.3.457
Problem:    When setting $VIMRUNTIME later the directory for fetching
            translated messages is not adjusted.
Solution:   Put bindtextdomain() in vim_setenv().
---

diff --git a/src/misc1.c b/src/misc1.c
index 1945d0ac9..cc2923908 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -4133,17 +4133,6 @@ vim_getenv(name, mustfree)
 	{
 	    vim_setenv((char_u *)"VIMRUNTIME", p);
 	    didset_vimruntime = TRUE;
-#ifdef FEAT_GETTEXT
-	    {
-		char_u	*buf = concat_str(p, (char_u *)"/lang");
-
-		if (buf != NULL)
-		{
-		    bindtextdomain(VIMPACKAGE, (char *)buf);
-		    vim_free(buf);
-		}
-	    }
-#endif
 	}
 	else
 	{
@@ -4221,6 +4210,22 @@ vim_setenv(name, val)
 	putenv((char *)envbuf);
     }
 #endif
+#ifdef FEAT_GETTEXT
+    /*
+     * When setting $VIMRUNTIME adjust the directory to find message
+     * translations to $VIMRUNTIME/lang.
+     */
+    if (*val != NUL && STRICMP(name, "VIMRUNTIME") == 0)
+    {
+	char_u	*buf = concat_str(val, (char_u *)"/lang");
+
+	if (buf != NULL)
+	{
+	    bindtextdomain(VIMPACKAGE, (char *)buf);
+	    vim_free(buf);
+	}
+    }
+#endif
 }
 
 #if defined(FEAT_CMDL_COMPL) || defined(PROTO)
diff --git a/src/version.c b/src/version.c
index f47e7bd16..83965f44e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    457,
 /**/
     456,
 /**/