diff options
| author | Noam Postavsky <npostavs@gmail.com> | 2016-06-29 18:52:57 -0400 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2016-07-18 17:22:06 -0400 |
| commit | 73f0715df53c6a12a3d9039ac1a1664d30c293ff (patch) | |
| tree | 713607d32db74cf9c0f3c35dcc3a65e40da1304e /src/callproc.c | |
| parent | 1879b9055eaf5c9f3fd126c2c21450cdd8c83262 (diff) | |
| download | emacs-73f0715df53c6a12a3d9039ac1a1664d30c293ff.tar.gz emacs-73f0715df53c6a12a3d9039ac1a1664d30c293ff.tar.bz2 emacs-73f0715df53c6a12a3d9039ac1a1664d30c293ff.zip | |
Keep w32 environment settings internal only
* src/emacs.c (main) [WINDOWSNT]: Move init_environment calls after the
set_initial_environment call. This prevents Emacs' modifications to the
environment from contaminating Vprocess_environment and
Vinitial_environment (Bug #10980).
* src/callproc.c (getenv_internal) [WINDOWSNT]: Consult Emacs' internal
environment in as a fallback to Vprocess_environment.
* test/src/callproc-tests.el (initial-environment-preserved): New Test.
Diffstat (limited to 'src/callproc.c')
| -rw-r--r-- | src/callproc.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/callproc.c b/src/callproc.c index 7008b916dad..e8d089cf20e 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -1375,6 +1375,20 @@ getenv_internal (const char *var, ptrdiff_t varlen, char **value, Vprocess_environment)) return *value ? 1 : 0; + /* On Windows we make some modifications to Emacs' enviroment + without recording them in Vprocess_environment. */ +#ifdef WINDOWSNT + { + char* tmpval = getenv (var); + if (tmpval) + { + *value = tmpval; + *valuelen = strlen (tmpval); + return 1; + } + } +#endif + /* For DISPLAY try to get the values from the frame or the initial env. */ if (strcmp (var, "DISPLAY") == 0) { |