|
 |
cb63ccc |
To: vim_dev@googlegroups.com
|
|
|
cb63ccc |
Subject: Patch 7.3.276
|
|
|
cb63ccc |
Fcc: outbox
|
|
|
cb63ccc |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
cb63ccc |
Mime-Version: 1.0
|
|
|
cb63ccc |
Content-Type: text/plain; charset=UTF-8
|
|
|
cb63ccc |
Content-Transfer-Encoding: 8bit
|
|
|
cb63ccc |
------------
|
|
|
cb63ccc |
|
|
|
cb63ccc |
Patch 7.3.276
|
|
|
cb63ccc |
Problem: GvimExt sets $LANG in the wrong way.
|
|
|
cb63ccc |
Solution: Save the environment and use it for gvim. (Yasuhiro Matsumoto)
|
|
|
cb63ccc |
Files: src/GvimExt/gvimext.cpp
|
|
|
cb63ccc |
|
|
|
cb63ccc |
|
|
|
cb63ccc |
*** ../vim-7.3.275/src/GvimExt/gvimext.cpp 2011-07-20 17:27:17.000000000 +0200
|
|
|
cb63ccc |
--- src/GvimExt/gvimext.cpp 2011-08-10 16:25:32.000000000 +0200
|
|
|
cb63ccc |
***************
|
|
|
cb63ccc |
*** 142,147 ****
|
|
|
cb63ccc |
--- 142,148 ----
|
|
|
cb63ccc |
static int dyn_libintl_init(char *dir);
|
|
|
cb63ccc |
static void dyn_libintl_end(void);
|
|
|
cb63ccc |
|
|
|
cb63ccc |
+ static wchar_t *oldenv = NULL;
|
|
|
cb63ccc |
static HINSTANCE hLibintlDLL = 0;
|
|
|
cb63ccc |
static char *(*dyn_libintl_gettext)(const char *) = null_libintl_gettext;
|
|
|
cb63ccc |
static char *(*dyn_libintl_textdomain)(const char *) = null_libintl_textdomain;
|
|
|
cb63ccc |
***************
|
|
|
cb63ccc |
*** 339,346 ****
|
|
|
cb63ccc |
inc_cRefThisDLL()
|
|
|
cb63ccc |
{
|
|
|
cb63ccc |
#ifdef FEAT_GETTEXT
|
|
|
cb63ccc |
! if (g_cRefThisDll == 0)
|
|
|
cb63ccc |
dyn_gettext_load();
|
|
|
cb63ccc |
#endif
|
|
|
cb63ccc |
InterlockedIncrement((LPLONG)&g_cRefThisDll);
|
|
|
cb63ccc |
}
|
|
|
cb63ccc |
--- 340,349 ----
|
|
|
cb63ccc |
inc_cRefThisDLL()
|
|
|
cb63ccc |
{
|
|
|
cb63ccc |
#ifdef FEAT_GETTEXT
|
|
|
cb63ccc |
! if (g_cRefThisDll == 0) {
|
|
|
cb63ccc |
dyn_gettext_load();
|
|
|
cb63ccc |
+ oldenv = GetEnvironmentStringsW();
|
|
|
cb63ccc |
+ }
|
|
|
cb63ccc |
#endif
|
|
|
cb63ccc |
InterlockedIncrement((LPLONG)&g_cRefThisDll);
|
|
|
cb63ccc |
}
|
|
|
cb63ccc |
***************
|
|
|
cb63ccc |
*** 349,356 ****
|
|
|
cb63ccc |
dec_cRefThisDLL()
|
|
|
cb63ccc |
{
|
|
|
cb63ccc |
#ifdef FEAT_GETTEXT
|
|
|
cb63ccc |
! if (InterlockedDecrement((LPLONG)&g_cRefThisDll) == 0)
|
|
|
cb63ccc |
dyn_gettext_free();
|
|
|
cb63ccc |
#else
|
|
|
cb63ccc |
InterlockedDecrement((LPLONG)&g_cRefThisDll);
|
|
|
cb63ccc |
#endif
|
|
|
cb63ccc |
--- 352,364 ----
|
|
|
cb63ccc |
dec_cRefThisDLL()
|
|
|
cb63ccc |
{
|
|
|
cb63ccc |
#ifdef FEAT_GETTEXT
|
|
|
cb63ccc |
! if (InterlockedDecrement((LPLONG)&g_cRefThisDll) == 0) {
|
|
|
cb63ccc |
dyn_gettext_free();
|
|
|
cb63ccc |
+ if (oldenv != NULL) {
|
|
|
cb63ccc |
+ FreeEnvironmentStringsW(oldenv);
|
|
|
cb63ccc |
+ oldenv = NULL;
|
|
|
cb63ccc |
+ }
|
|
|
cb63ccc |
+ }
|
|
|
cb63ccc |
#else
|
|
|
cb63ccc |
InterlockedDecrement((LPLONG)&g_cRefThisDll);
|
|
|
cb63ccc |
#endif
|
|
|
cb63ccc |
***************
|
|
|
cb63ccc |
*** 905,912 ****
|
|
|
cb63ccc |
NULL, // Process handle not inheritable.
|
|
|
cb63ccc |
NULL, // Thread handle not inheritable.
|
|
|
cb63ccc |
FALSE, // Set handle inheritance to FALSE.
|
|
|
cb63ccc |
! 0, // No creation flags.
|
|
|
cb63ccc |
! NULL, // Use parent's environment block.
|
|
|
cb63ccc |
NULL, // Use parent's starting directory.
|
|
|
cb63ccc |
&si, // Pointer to STARTUPINFO structure.
|
|
|
cb63ccc |
&pi) // Pointer to PROCESS_INFORMATION structure.
|
|
|
cb63ccc |
--- 913,920 ----
|
|
|
cb63ccc |
NULL, // Process handle not inheritable.
|
|
|
cb63ccc |
NULL, // Thread handle not inheritable.
|
|
|
cb63ccc |
FALSE, // Set handle inheritance to FALSE.
|
|
|
cb63ccc |
! oldenv == NULL ? 0 : CREATE_UNICODE_ENVIRONMENT,
|
|
|
cb63ccc |
! oldenv, // Use unmodified environment block.
|
|
|
cb63ccc |
NULL, // Use parent's starting directory.
|
|
|
cb63ccc |
&si, // Pointer to STARTUPINFO structure.
|
|
|
cb63ccc |
&pi) // Pointer to PROCESS_INFORMATION structure.
|
|
|
cb63ccc |
***************
|
|
|
cb63ccc |
*** 987,994 ****
|
|
|
cb63ccc |
NULL, // Process handle not inheritable.
|
|
|
cb63ccc |
NULL, // Thread handle not inheritable.
|
|
|
cb63ccc |
FALSE, // Set handle inheritance to FALSE.
|
|
|
cb63ccc |
! 0, // No creation flags.
|
|
|
cb63ccc |
! NULL, // Use parent's environment block.
|
|
|
cb63ccc |
NULL, // Use parent's starting directory.
|
|
|
cb63ccc |
&si, // Pointer to STARTUPINFO structure.
|
|
|
cb63ccc |
&pi) // Pointer to PROCESS_INFORMATION structure.
|
|
|
cb63ccc |
--- 995,1002 ----
|
|
|
cb63ccc |
NULL, // Process handle not inheritable.
|
|
|
cb63ccc |
NULL, // Thread handle not inheritable.
|
|
|
cb63ccc |
FALSE, // Set handle inheritance to FALSE.
|
|
|
cb63ccc |
! oldenv == NULL ? 0 : CREATE_UNICODE_ENVIRONMENT,
|
|
|
cb63ccc |
! oldenv, // Use unmodified environment block.
|
|
|
cb63ccc |
NULL, // Use parent's starting directory.
|
|
|
cb63ccc |
&si, // Pointer to STARTUPINFO structure.
|
|
|
cb63ccc |
&pi) // Pointer to PROCESS_INFORMATION structure.
|
|
|
cb63ccc |
*** ../vim-7.3.275/src/version.c 2011-08-10 15:56:24.000000000 +0200
|
|
|
cb63ccc |
--- src/version.c 2011-08-10 16:28:42.000000000 +0200
|
|
|
cb63ccc |
***************
|
|
|
cb63ccc |
*** 711,712 ****
|
|
|
cb63ccc |
--- 711,714 ----
|
|
|
cb63ccc |
{ /* Add new patch number below this line */
|
|
|
cb63ccc |
+ /**/
|
|
|
cb63ccc |
+ 276,
|
|
|
cb63ccc |
/**/
|
|
|
cb63ccc |
|
|
|
cb63ccc |
--
|
|
|
cb63ccc |
User: I'm having problems with my text editor.
|
|
|
cb63ccc |
Help desk: Which editor are you using?
|
|
|
cb63ccc |
User: I don't know, but it's version VI (pronounced: 6).
|
|
|
cb63ccc |
Help desk: Oh, then you should upgrade to version VIM (pronounced: 994).
|
|
|
cb63ccc |
|
|
|
cb63ccc |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
cb63ccc |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
cb63ccc |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
cb63ccc |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|