diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2010-07-25 20:36:37 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2010-07-25 20:36:37 +0200 |
| commit | 7bfa6d7793030944556daeede46dff688465cfd7 (patch) | |
| tree | 650b005ff6ec69e17e04d5e830fa87d70cb0e2d2 | |
| parent | 63f9a672cbb01aa1a4eaf67dacd6d04b47c4ea1d (diff) | |
| download | emacs-7bfa6d7793030944556daeede46dff688465cfd7.tar.gz | |
* callproc.c (set_initial_environment): Avoid unbalanced braces.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/callproc.c | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f0cc70192b9..0ed773d1acd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2010-07-25 Andreas Schwab <schwab@linux-m68k.org> + + * callproc.c (set_initial_environment): Avoid unbalanced braces. + 2010-07-25 Ken Brown <kbrown@cornell.edu> * vm-limit.c (check_memory_limits): Fix previous change; diff --git a/src/callproc.c b/src/callproc.c index 7f72df86ece..7019d741b34 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -1530,13 +1530,12 @@ void set_initial_environment (void) { register char **envp; -#ifndef CANNOT_DUMP - if (initialized) - { +#ifdef CANNOT_DUMP + Vprocess_environment = Qnil; #else - { - Vprocess_environment = Qnil; + if (initialized) #endif + { for (envp = environ; *envp; envp++) Vprocess_environment = Fcons (build_string (*envp), Vprocess_environment); |