diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-06-07 23:42:25 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-06-07 23:42:25 +0100 |
| commit | 7acc4addb51c711afed3761302c2d3457125445c (patch) | |
| tree | 03cca6f3242974dba6adc2c1d1b721a595d24a37 /cmd-switch-client.c | |
| parent | a5c55e439383202547e442f6afc0c8c664687728 (diff) | |
| parent | c4e811e51936edab66803a7b9e099ac135e6e19b (diff) | |
| download | rtmux-7acc4addb51c711afed3761302c2d3457125445c.tar.gz rtmux-7acc4addb51c711afed3761302c2d3457125445c.tar.bz2 rtmux-7acc4addb51c711afed3761302c2d3457125445c.zip | |
Merge branch 'obsd-master'
Conflicts:
client.c
tmux.1
tmux.c
Diffstat (limited to 'cmd-switch-client.c')
| -rw-r--r-- | cmd-switch-client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd-switch-client.c b/cmd-switch-client.c index 369fc917..23751d73 100644 --- a/cmd-switch-client.c +++ b/cmd-switch-client.c @@ -31,8 +31,8 @@ enum cmd_retval cmd_switch_client_exec(struct cmd *, struct cmd_q *); const struct cmd_entry cmd_switch_client_entry = { "switch-client", "switchc", - "lc:npt:rT:", 0, 0, - "[-lnpr] [-c target-client] [-t target-session] [-T key-table]", + "lc:Enpt:rT:", 0, 0, + "[-Elnpr] [-c target-client] [-t target-session] [-T key-table]", CMD_READONLY, cmd_switch_client_exec }; @@ -119,7 +119,7 @@ cmd_switch_client_exec(struct cmd *self, struct cmd_q *cmdq) } } - if (c != NULL && s != c->session) { + if (c != NULL && s != c->session && !args_has(args, 'E')) { update = options_get_string(&s->options, "update-environment"); environ_update(update, &c->environ, &s->environ); } |