mirror of
https://github.com/tmux/tmux.git
synced 2024-12-13 10:08:47 +00:00
Merge branch 'master' of github.com:tmux/tmux
This commit is contained in:
commit
28c33f67bc
9
README
9
README
@ -52,9 +52,10 @@ welcome. Please send by email to:
|
||||
|
||||
tmux-users@googlegroups.com
|
||||
|
||||
This file and the CHANGES, FAQ and TODO files are licensed under the ISC
|
||||
license. Files under examples/ remain copyright their authors unless otherwise
|
||||
stated in the file but permission has been received to distribute them with
|
||||
tmux. All other files have a license and copyright notice at their start.
|
||||
This file and the CHANGES, FAQ, SYNCING and TODO files are licensed under
|
||||
the ISC license. Files under examples/ remain copyright their authors unless
|
||||
otherwise stated in the file but permission has been received to distribute
|
||||
them with tmux. All other files have a license and copyright notice at their
|
||||
start.
|
||||
|
||||
-- Nicholas Marriott <nicholas.marriott@gmail.com>
|
||||
|
@ -126,6 +126,12 @@ cmd_attach_session(struct cmd_q *cmdq, const char *tflag, int dflag, int rflag,
|
||||
s->cwd = fd;
|
||||
}
|
||||
|
||||
if (!Eflag) {
|
||||
update = options_get_string(&s->options,
|
||||
"update-environment");
|
||||
environ_update(update, &c->environ, &s->environ);
|
||||
}
|
||||
|
||||
c->session = s;
|
||||
notify_attached_session_changed(c);
|
||||
session_update_activity(s);
|
||||
|
@ -119,7 +119,7 @@ cmd_switch_client_exec(struct cmd *self, struct cmd_q *cmdq)
|
||||
}
|
||||
}
|
||||
|
||||
if (c != NULL && s != c->session && !args_has(args, 'E')) {
|
||||
if (c != NULL && !args_has(args, 'E')) {
|
||||
update = options_get_string(&s->options, "update-environment");
|
||||
environ_update(update, &c->environ, &s->environ);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user