aboutsummaryrefslogtreecommitdiff
path: root/spawn.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2019-04-28 23:02:30 +0100
committerThomas Adam <thomas@xteddy.org>2019-04-28 23:02:30 +0100
commit3ab229da706bc8cffadfa500708937c1e3e84145 (patch)
treefdd4c60ba6addc019b8d249c5deb3d5d14f92591 /spawn.c
parent2cecabd75ecb19e46c221c76f642807869ae63e6 (diff)
parentc4b0da5513ee4c9692f0980408b0da2ee7e3a553 (diff)
downloadrtmux-3ab229da706bc8cffadfa500708937c1e3e84145.tar.gz
rtmux-3ab229da706bc8cffadfa500708937c1e3e84145.tar.bz2
rtmux-3ab229da706bc8cffadfa500708937c1e3e84145.zip
Merge branch 'obsd-master'
Diffstat (limited to 'spawn.c')
-rw-r--r--spawn.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/spawn.c b/spawn.c
index 1da3c857..6892e578 100644
--- a/spawn.c
+++ b/spawn.c
@@ -291,6 +291,8 @@ spawn_pane(struct spawn_context *sc, char **cause)
/* Create an environment for this pane. */
child = environ_for_session(s, 0);
+ if (sc->environ != NULL)
+ environ_copy(sc->environ, child);
environ_set(child, "TMUX_PANE", "%%%u", new_wp->id);
/*