Remove CMD_SENDENVIRON.

This commit is contained in:
Nicholas Marriott 2013-10-06 00:02:52 +01:00
parent 5eeee39cc1
commit 7e4314eccb
4 changed files with 5 additions and 9 deletions

View File

@ -179,7 +179,7 @@ client_main(int argc, char **argv, int flags)
cmdflags = CMD_STARTSERVER; cmdflags = CMD_STARTSERVER;
} else if (argc == 0) { } else if (argc == 0) {
msg = MSG_COMMAND; msg = MSG_COMMAND;
cmdflags = CMD_STARTSERVER|CMD_SENDENVIRON|CMD_CANTNEST; cmdflags = CMD_STARTSERVER|CMD_CANTNEST;
} else { } else {
msg = MSG_COMMAND; msg = MSG_COMMAND;
@ -197,8 +197,6 @@ client_main(int argc, char **argv, int flags)
TAILQ_FOREACH(cmd, &cmdlist->list, qentry) { TAILQ_FOREACH(cmd, &cmdlist->list, qentry) {
if (cmd->entry->flags & CMD_STARTSERVER) if (cmd->entry->flags & CMD_STARTSERVER)
cmdflags |= CMD_STARTSERVER; cmdflags |= CMD_STARTSERVER;
if (cmd->entry->flags & CMD_SENDENVIRON)
cmdflags |= CMD_SENDENVIRON;
if (cmd->entry->flags & CMD_CANTNEST) if (cmd->entry->flags & CMD_CANTNEST)
cmdflags |= CMD_CANTNEST; cmdflags |= CMD_CANTNEST;
} }
@ -262,7 +260,6 @@ client_main(int argc, char **argv, int flags)
set_signals(client_signal); set_signals(client_signal);
/* Send initial environment. */ /* Send initial environment. */
if (cmdflags & CMD_SENDENVIRON)
client_send_environ(); client_send_environ();
client_send_identify(flags); client_send_identify(flags);

View File

@ -32,7 +32,7 @@ const struct cmd_entry cmd_attach_session_entry = {
"attach-session", "attach", "attach-session", "attach",
"drt:", 0, 0, "drt:", 0, 0,
"[-dr] " CMD_TARGET_SESSION_USAGE, "[-dr] " CMD_TARGET_SESSION_USAGE,
CMD_CANTNEST|CMD_STARTSERVER|CMD_SENDENVIRON, CMD_CANTNEST|CMD_STARTSERVER,
NULL, NULL,
cmd_attach_session_exec cmd_attach_session_exec
}; };

View File

@ -38,7 +38,7 @@ const struct cmd_entry cmd_new_session_entry = {
"[-AdDP] [-c start-directory] [-F format] [-n window-name] " "[-AdDP] [-c start-directory] [-F format] [-n window-name] "
"[-s session-name] " CMD_TARGET_SESSION_USAGE " [-x width] [-y height] " "[-s session-name] " CMD_TARGET_SESSION_USAGE " [-x width] [-y height] "
"[command]", "[command]",
CMD_STARTSERVER|CMD_CANTNEST|CMD_SENDENVIRON, CMD_STARTSERVER|CMD_CANTNEST,
NULL, NULL,
cmd_new_session_exec cmd_new_session_exec
}; };

3
tmux.h
View File

@ -1447,8 +1447,7 @@ struct cmd_entry {
#define CMD_STARTSERVER 0x1 #define CMD_STARTSERVER 0x1
#define CMD_CANTNEST 0x2 #define CMD_CANTNEST 0x2
#define CMD_SENDENVIRON 0x4 #define CMD_READONLY 0x4
#define CMD_READONLY 0x8
int flags; int flags;
void (*key_binding)(struct cmd *, int); void (*key_binding)(struct cmd *, int);