From 7e4314eccbc9dd36340e6ca3d0eccfc7e678b219 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Sun, 6 Oct 2013 00:02:52 +0100
Subject: [PATCH] Remove CMD_SENDENVIRON.

---
 client.c             | 7 ++-----
 cmd-attach-session.c | 2 +-
 cmd-new-session.c    | 2 +-
 tmux.h               | 3 +--
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/client.c b/client.c
index b9e3b30a..bb1b34cf 100644
--- a/client.c
+++ b/client.c
@@ -179,7 +179,7 @@ client_main(int argc, char **argv, int flags)
 		cmdflags = CMD_STARTSERVER;
 	} else if (argc == 0) {
 		msg = MSG_COMMAND;
-		cmdflags = CMD_STARTSERVER|CMD_SENDENVIRON|CMD_CANTNEST;
+		cmdflags = CMD_STARTSERVER|CMD_CANTNEST;
 	} else {
 		msg = MSG_COMMAND;
 
@@ -197,8 +197,6 @@ client_main(int argc, char **argv, int flags)
 		TAILQ_FOREACH(cmd, &cmdlist->list, qentry) {
 			if (cmd->entry->flags & CMD_STARTSERVER)
 				cmdflags |= CMD_STARTSERVER;
-			if (cmd->entry->flags & CMD_SENDENVIRON)
-				cmdflags |= CMD_SENDENVIRON;
 			if (cmd->entry->flags & CMD_CANTNEST)
 				cmdflags |= CMD_CANTNEST;
 		}
@@ -262,8 +260,7 @@ client_main(int argc, char **argv, int flags)
 	set_signals(client_signal);
 
 	/* Send initial environment. */
-	if (cmdflags & CMD_SENDENVIRON)
-		client_send_environ();
+	client_send_environ();
 	client_send_identify(flags);
 
 	/* Send first command. */
diff --git a/cmd-attach-session.c b/cmd-attach-session.c
index cf5f30a4..7a952e59 100644
--- a/cmd-attach-session.c
+++ b/cmd-attach-session.c
@@ -32,7 +32,7 @@ const struct cmd_entry cmd_attach_session_entry = {
 	"attach-session", "attach",
 	"drt:", 0, 0,
 	"[-dr] " CMD_TARGET_SESSION_USAGE,
-	CMD_CANTNEST|CMD_STARTSERVER|CMD_SENDENVIRON,
+	CMD_CANTNEST|CMD_STARTSERVER,
 	NULL,
 	cmd_attach_session_exec
 };
diff --git a/cmd-new-session.c b/cmd-new-session.c
index 1c743a8e..38c79a6d 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -38,7 +38,7 @@ const struct cmd_entry cmd_new_session_entry = {
 	"[-AdDP] [-c start-directory] [-F format] [-n window-name] "
 	"[-s session-name] " CMD_TARGET_SESSION_USAGE " [-x width] [-y height] "
 	"[command]",
-	CMD_STARTSERVER|CMD_CANTNEST|CMD_SENDENVIRON,
+	CMD_STARTSERVER|CMD_CANTNEST,
 	NULL,
 	cmd_new_session_exec
 };
diff --git a/tmux.h b/tmux.h
index b6b66fba..dd351950 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1447,8 +1447,7 @@ struct cmd_entry {
 
 #define CMD_STARTSERVER 0x1
 #define CMD_CANTNEST 0x2
-#define CMD_SENDENVIRON 0x4
-#define CMD_READONLY 0x8
+#define CMD_READONLY 0x4
 	int		 flags;
 
 	void		 (*key_binding)(struct cmd *, int);