From 29c29e771767b037f2929b889bb0de2b0b6ee138 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sun, 14 Jun 2015 10:07:44 +0000
Subject: Add a format for client PID (client_pid) and server PID (pid). Diff
 for client_pid from Thomas Adam.

---
 tmux.1 | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tmux.1')

diff --git a/tmux.1 b/tmux.1
index 16e979ad..70b43a7a 100644
--- a/tmux.1
+++ b/tmux.1
@@ -3353,6 +3353,7 @@ The following variables are available, where appropriate:
 .It Li "client_created_string" Ta "" Ta "String time client created"
 .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"
 .It Li "client_prefix" Ta "" Ta "1 if prefix key has been pressed"
 .It Li "client_readonly" Ta "" Ta "1 if client is readonly"
 .It Li "client_session" Ta "" Ta "Name of the client's session"
@@ -3396,6 +3397,7 @@ The following variables are available, where appropriate:
 .It Li "pane_top" Ta "" Ta "Top of pane"
 .It Li "pane_tty" Ta "" Ta "Pseudo terminal of pane"
 .It Li "pane_width" Ta "" Ta "Width of pane"
+.It Li "pid" Ta ""  Ta "Server PID"
 .It Li "scroll_region_lower" Ta "" Ta "Bottom of scroll region in pane"
 .It Li "scroll_region_upper" Ta "" Ta "Top of scroll region in pane"
 .It Li "session_alerts" Ta "" Ta "List of window indexes with alerts"
-- 
cgit 


From d96ab3401960ab4a7c9434dfda1ebdc5204873e0 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 15 Jun 2015 10:58:01 +0000
Subject: Add window_activity format, from Thomas Adam based on a diff
 originally from propos6 at gmail dot com.

---
 tmux.1 | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tmux.1')

diff --git a/tmux.1 b/tmux.1
index 70b43a7a..400378fc 100644
--- a/tmux.1
+++ b/tmux.1
@@ -3414,6 +3414,8 @@ The following variables are available, where appropriate:
 .It Li "session_name" Ta "#S" Ta "Name of session"
 .It Li "session_width" Ta "" Ta "Width of session"
 .It Li "session_windows" Ta "" Ta "Number of windows in session"
+.It Li "window_activity" Ta "" Ta "Integer time of window last activity"
+.It Li "window_activity_string" Ta "" Ta "String time of window last activity"
 .It Li "window_active" Ta "" Ta "1 if window active"
 .It Li "window_activity_flag" Ta "" Ta "1 if window has activity alert"
 .It Li "window_bell_flag" Ta "" Ta "1 if window has bell"
-- 
cgit 


From 0ff335961eec019d776f19bd8c26cce7cde0effa Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 17 Jun 2015 16:50:28 +0000
Subject: Move the shuffle code from new-window -a into a function and add a -a
 flag for move-window too. From Thomas Adam.

---
 tmux.1 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'tmux.1')

diff --git a/tmux.1 b/tmux.1
index 400378fc..fb014898 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1544,7 +1544,7 @@ If no
 .Ar target-session
 is specified, select the last window of the current session.
 .It Xo Ic link-window
-.Op Fl dk
+.Op Fl adk
 .Op Fl s Ar src-window
 .Op Fl t Ar dst-window
 .Xc
@@ -1558,6 +1558,10 @@ If
 is specified and no such window exists, the
 .Ar src-window
 is linked there.
+With
+.Fl a ,
+the window is moved to the next index up (following windows
+are moved if necessary).
 If
 .Fl k
 is given and
@@ -1623,7 +1627,7 @@ and
 .Ar dst-pane
 may belong to the same window.
 .It Xo Ic move-window
-.Op Fl rdk
+.Op Fl ardk
 .Op Fl s Ar src-window
 .Op Fl t Ar dst-window
 .Xc
-- 
cgit 


From 85120b37eaa33f572f8f4c12a050c431a6efba3e Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 17 Jun 2015 19:56:08 +0000
Subject: Change break-pane to take target and source panes (-t and -s) in line
 with other commands, from Thomas Adam.

---
 tmux.1 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'tmux.1')

diff --git a/tmux.1 b/tmux.1
index fb014898..033330b7 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1233,12 +1233,14 @@ Commands related to windows and panes are as follows:
 .It Xo Ic break-pane
 .Op Fl dP
 .Op Fl F Ar format
-.Op Fl t Ar target-pane
+.Op Fl s Ar src-pane
+.Op Fl t Ar dst-pane
 .Xc
 .D1 (alias: Ic breakp )
 Break
-.Ar target-pane
-off from its containing window to make it the only pane in a new window.
+.Ar src-pane
+off from its containing window to make it the only pane in
+.Ar dst-window .
 If
 .Fl d
 is given, the new window does not become the current window.
-- 
cgit 


From 164ba041c9301d8c804a9f76da8ac62a8de286de Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 18 Jun 2015 23:53:56 +0000
Subject: Remove a stray : and tweak paragraph.

---
 tmux.1 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'tmux.1')

diff --git a/tmux.1 b/tmux.1
index 033330b7..f0dd569a 100644
--- a/tmux.1
+++ b/tmux.1
@@ -404,14 +404,15 @@ An
 pattern which is matched against the session name.
 .El
 .Pp
-If the session name is prefixed with a
-.Ql = : ,
+If the session name is prefixed with an
+.Ql = ,
 only an exact match is accepted (so
 .Ql =mysess
 will only match exactly
 .Ql mysess ,
 not
 .Ql mysession ) .
+.Pp
 If a single session is found, it is used as the target session; multiple matches
 produce an error.
 If a session is omitted, the current session is used if available; if no
-- 
cgit