diff options
Diffstat (limited to 'usr.bin/tmux')
| -rw-r--r-- | usr.bin/tmux/client.c | 9 | ||||
| -rw-r--r-- | usr.bin/tmux/cmd-attach-session.c | 4 | ||||
| -rw-r--r-- | usr.bin/tmux/cmd-new-session.c | 4 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.h | 5 |
4 files changed, 9 insertions, 13 deletions
diff --git a/usr.bin/tmux/client.c b/usr.bin/tmux/client.c index 6cd76bd3961..4ed9b0e724f 100644 --- a/usr.bin/tmux/client.c +++ b/usr.bin/tmux/client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: client.c,v 1.66 2013/04/22 08:42:19 nicm Exp $ */ +/* $OpenBSD: client.c,v 1.67 2013/10/10 12:09:34 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -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; } @@ -258,8 +256,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/usr.bin/tmux/cmd-attach-session.c b/usr.bin/tmux/cmd-attach-session.c index 97565abb649..1178cda4401 100644 --- a/usr.bin/tmux/cmd-attach-session.c +++ b/usr.bin/tmux/cmd-attach-session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-attach-session.c,v 1.25 2013/10/10 12:00:18 nicm Exp $ */ +/* $OpenBSD: cmd-attach-session.c,v 1.26 2013/10/10 12:09:34 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -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/usr.bin/tmux/cmd-new-session.c b/usr.bin/tmux/cmd-new-session.c index 0576806e203..8c089fbd353 100644 --- a/usr.bin/tmux/cmd-new-session.c +++ b/usr.bin/tmux/cmd-new-session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-new-session.c,v 1.52 2013/10/10 12:07:36 nicm Exp $ */ +/* $OpenBSD: cmd-new-session.c,v 1.53 2013/10/10 12:09:34 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -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/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index 5f1f2a61c00..a040e286ca5 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.421 2013/10/10 12:07:37 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.422 2013/10/10 12:09:34 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -1450,8 +1450,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); |