From 6308c48efd7a80dad5701721f76b9aafb9b814f8 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 13 Jul 2015 13:36:29 +0000
Subject: Add a -s flag to show-environment to output Bourne shell commands a
 la ssh-agent. Mostly from Cam Hutchison with some changes by me.

---
 tmux.1 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'tmux.1')

diff --git a/tmux.1 b/tmux.1
index f0dd569a..db5f314e 100644
--- a/tmux.1
+++ b/tmux.1
@@ -3542,7 +3542,7 @@ flag unsets a variable.
 indicates the variable is to be removed from the environment before starting a
 new process.
 .It Xo Ic show-environment
-.Op Fl g
+.Op Fl gs
 .Op Fl t Ar target-session
 .Op Ar variable
 .Xc
@@ -3556,6 +3556,9 @@ If
 is omitted, all variables are shown.
 Variables removed from the environment are prefixed with
 .Ql - .
+If
+.Fl s
+is used, the output is formatted as a set of Bourne shell commands.
 .El
 .Sh STATUS LINE
 .Nm
-- 
cgit 


From 81069f66f96dd83025fc6f2990619eb861199e10 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 13 Jul 2015 15:37:26 +0000
Subject: Add a format to show if client is a control client. From Bruno Sutic.

---
 tmux.1 | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tmux.1')

diff --git a/tmux.1 b/tmux.1
index db5f314e..b4c608cb 100644
--- a/tmux.1
+++ b/tmux.1
@@ -3358,6 +3358,7 @@ The following variables are available, where appropriate:
 .It Li "client_activity_string" Ta "" Ta "String time client last had activity"
 .It Li "client_created" Ta "" Ta "Integer time client created"
 .It Li "client_created_string" Ta "" Ta "String time client created"
+.It Li "client_control_mode" Ta "" Ta "1 if client is in control mode"
 .It Li "client_height" Ta "" Ta "Height of client"
 .It Li "client_last_session" Ta "" Ta "Name of the client's last session"
 .It Li "client_pid" Ta "" Ta "PID of client process"
-- 
cgit