3 files changed, 12 insertions, 0 deletions
diff --git a/environ.c b/environ.c
index 31e57e0e..7709f29d 100644
--- a/environ.c
+++ b/environ.c
@@ -203,3 +203,13 @@ environ_push(struct environ *env)
 			setenv(envent->name, envent->value, 1);
 	}
 }
+
+/* Log the environment. */
+void
+environ_log(struct environ *env)
+{
+	struct environ_entry	*envent;
+
+	RB_FOREACH(envent, environ, env)
+	    log_debug("%s=%s", envent->name, envent->value);
+}
diff --git a/tmux.h b/tmux.h
index f461c495..95d942f2 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1693,6 +1693,7 @@ void	environ_put(struct environ *, const char *);
 void	environ_unset(struct environ *, const char *);
 void	environ_update(const char *, struct environ *, struct environ *);
 void	environ_push(struct environ *);
+void	environ_log(struct environ *);
 
 /* tty.c */
 void	tty_create_log(void);
diff --git a/window.c b/window.c
index 0b24d57a..2f158e3a 100644
--- a/window.c
+++ b/window.c
@@ -842,6 +842,7 @@ window_pane_spawn(struct window_pane *wp, int argc, char **argv,
 	log_debug("spawn: %s -- %s", wp->shell, cmd);
 	for (i = 0; i < wp->argc; i++)
 		log_debug("spawn: argv[%d] = %s", i, wp->argv[i]);
+	environ_log(env);
 
 	memset(&ws, 0, sizeof ws);
 	ws.ws_col = screen_size_x(&wp->base);