diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2009-08-23 18:21:03 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2009-08-23 18:21:03 +0000 |
| commit | e67449ef2a86818cc9e6bb994e8313a3c3be6b2a (patch) | |
| tree | cba6a66f60e64efb230b765ba7071910b097db1f /usr.bin/tmux | |
| parent | 9a24c2c29396edb23f609b723d5f3e362e5b38af (diff) | |
Add some other obvious variables to update-environment (WINDOWID SSH_ASKPASS
SSH_AUTH_SOCK SSH_AGENT_PID SSH_CONNECTION) so they are updated in the session
environment on new/attach.
Diffstat (limited to 'usr.bin/tmux')
| -rw-r--r-- | usr.bin/tmux/tmux.1 | 6 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.c | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1 index 1a009208940..6f297d80646 100644 --- a/usr.bin/tmux/tmux.1 +++ b/usr.bin/tmux/tmux.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: tmux.1,v 1.74 2009/08/19 16:10:26 jmc Exp $ +.\" $OpenBSD: tmux.1,v 1.75 2009/08/23 18:21:02 nicm Exp $ .\" .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> .\" @@ -14,7 +14,7 @@ .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: August 19 2009 $ +.Dd $Mdocdate: August 23 2009 $ .Dt TMUX 1 .Os .Sh NAME @@ -1343,7 +1343,7 @@ was given to the .Ic set-environment command). The default is -.Ev DISPLAY . +"DISPLAY WINDOWID SSH_ASKPASS SSH_AUTH_SOCK SSH_AGENT_PID SSH_CONNECTION". .It Xo Ic visual-activity .Op Ic on | off .Xc diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c index 3c737f66c21..e8886a75774 100644 --- a/usr.bin/tmux/tmux.c +++ b/usr.bin/tmux/tmux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.c,v 1.34 2009/08/13 21:56:14 nicm Exp $ */ +/* $OpenBSD: tmux.c,v 1.35 2009/08/23 18:21:02 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -381,7 +381,8 @@ main(int argc, char **argv) options_set_number(&global_s_options, "status-utf8", 0); options_set_string(&global_s_options, "terminal-overrides", "*88col*:colors=88,*256col*:colors=256"); - options_set_string(&global_s_options, "update-environment", "DISPLAY"); + options_set_string(&global_s_options, "update-environment", "DISPLAY " + "WINDOWID SSH_ASKPASS SSH_AUTH_SOCK SSH_AGENT_PID SSH_CONNECTION"); options_set_number(&global_s_options, "visual-activity", 0); options_set_number(&global_s_options, "visual-bell", 0); options_set_number(&global_s_options, "visual-content", 0); |