diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-08-24 16:35:24 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-08-24 16:35:24 +0000 |
| commit | d5bc78d98b73572cffe21d4eb5798d13911b8eb7 (patch) | |
| tree | b13a550c583c218ead61b0137fb641775f21ceab | |
| parent | a3799e035056e19d13a4bab52f1965d3e3a0c0d6 (diff) | |
| download | rtmux-d5bc78d98b73572cffe21d4eb5798d13911b8eb7.tar.gz rtmux-d5bc78d98b73572cffe21d4eb5798d13911b8eb7.tar.bz2 rtmux-d5bc78d98b73572cffe21d4eb5798d13911b8eb7.zip | |
Sync OpenBSD patchset 292:
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.
| -rw-r--r-- | tmux.1 | 6 | ||||
| -rw-r--r-- | tmux.c | 5 |
2 files changed, 6 insertions, 5 deletions
@@ -1,4 +1,4 @@ -.\" $Id: tmux.1,v 1.156 2009-08-20 11:53:27 tcunha Exp $ +.\" $Id: tmux.1,v 1.157 2009-08-24 16:35:24 tcunha 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 @@ -1,4 +1,4 @@ -/* $Id: tmux.c,v 1.163 2009-08-16 19:20:37 tcunha Exp $ */ +/* $Id: tmux.c,v 1.164 2009-08-24 16:35:24 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -390,7 +390,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); |