aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2010-07-25 20:36:37 +0200
committerAndreas Schwab2010-07-25 20:36:37 +0200
commit7bfa6d7793030944556daeede46dff688465cfd7 (patch)
tree650b005ff6ec69e17e04d5e830fa87d70cb0e2d2 /src
parent63f9a672cbb01aa1a4eaf67dacd6d04b47c4ea1d (diff)
downloademacs-7bfa6d7793030944556daeede46dff688465cfd7.tar.gz
emacs-7bfa6d7793030944556daeede46dff688465cfd7.zip
* callproc.c (set_initial_environment): Avoid unbalanced braces.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/callproc.c9
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 @@
12010-07-25 Andreas Schwab <schwab@linux-m68k.org>
2
3 * callproc.c (set_initial_environment): Avoid unbalanced braces.
4
12010-07-25 Ken Brown <kbrown@cornell.edu> 52010-07-25 Ken Brown <kbrown@cornell.edu>
2 6
3 * vm-limit.c (check_memory_limits): Fix previous change; 7 * 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
1530set_initial_environment (void) 1530set_initial_environment (void)
1531{ 1531{
1532 register char **envp; 1532 register char **envp;
1533#ifndef CANNOT_DUMP 1533#ifdef CANNOT_DUMP
1534 if (initialized) 1534 Vprocess_environment = Qnil;
1535 {
1536#else 1535#else
1537 { 1536 if (initialized)
1538 Vprocess_environment = Qnil;
1539#endif 1537#endif
1538 {
1540 for (envp = environ; *envp; envp++) 1539 for (envp = environ; *envp; envp++)
1541 Vprocess_environment = Fcons (build_string (*envp), 1540 Vprocess_environment = Fcons (build_string (*envp),
1542 Vprocess_environment); 1541 Vprocess_environment);