summaryrefslogtreecommitdiff
path: root/usr.bin/tmux
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2010-11-11 21:06:10 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2010-11-11 21:06:10 +0000
commitc83805137c2f588e3bde557ca50d5a2a857ca542 (patch)
treefe2ab8362546f7b65a97446f68174578ba08751a /usr.bin/tmux
parent16043b208195fe60c8a42da84278afe176951710 (diff)
Add XAUTHORITY to update-environment, requested by Andreas Kloeckner.
Diffstat (limited to 'usr.bin/tmux')
-rw-r--r--usr.bin/tmux/tmux.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c
index 15a83e91c58..995b111c03b 100644
--- a/usr.bin/tmux/tmux.c
+++ b/usr.bin/tmux/tmux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.92 2010/10/18 20:00:03 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.93 2010/11/11 21:06:09 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -372,8 +372,11 @@ main(int argc, char **argv)
options_set_number(so, "status-right-length", 40);
options_set_string(so, "terminal-overrides",
"*88col*:colors=88,*256col*:colors=256");
- options_set_string(so, "update-environment", "DISPLAY "
- "WINDOWID SSH_ASKPASS SSH_AUTH_SOCK SSH_AGENT_PID SSH_CONNECTION");
+ options_set_string(so, "update-environment",
+ "DISPLAY "
+ "SSH_ASKPASS SSH_AUTH_SOCK SSH_AGENT_PID SSH_CONNECTION "
+ "WINDOWID "
+ "XAUTHORITY");
options_set_number(so, "visual-activity", 0);
options_set_number(so, "visual-bell", 0);
options_set_number(so, "visual-content", 0);