===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.1,v
retrieving revision 1.431
retrieving revision 1.432
diff -c -r1.431 -r1.432
*** src/usr.bin/tmux/tmux.1	2015/05/27 13:28:04	1.431
--- src/usr.bin/tmux/tmux.1	2015/06/04 11:43:51	1.432
***************
*** 1,4 ****
! .\" $OpenBSD: tmux.1,v 1.431 2015/05/27 13:28:04 nicm Exp $
  .\"
  .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
  .\"
--- 1,4 ----
! .\" $OpenBSD: tmux.1,v 1.432 2015/06/04 11:43:51 nicm Exp $
  .\"
  .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
  .\"
***************
*** 14,20 ****
  .\" 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: May 27 2015 $
  .Dt TMUX 1
  .Os
  .Sh NAME
--- 14,20 ----
  .\" 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: June 4 2015 $
  .Dt TMUX 1
  .Os
  .Sh NAME
***************
*** 298,303 ****
--- 298,309 ----
  Briefly display pane indexes.
  .It r
  Force redraw of the attached client.
+ .It m
+ Mark the current pane (see
+ .Ic select-pane
+ .Fl m ) .
+ .It M
+ Clear the marked pane.
  .It s
  Select a new session for the attached client interactively.
  .It t
***************
*** 351,356 ****
--- 357,364 ----
  .Nm .
  Most commands accept the optional
  .Fl t
+ (and sometimes
+ .Fl s )
  argument with one of
  .Ar target-client ,
  .Ar target-session
***************
*** 451,457 ****
  .It Li "{last}" Ta "!" Ta "The last (previously current) window"
  .It Li "{next}" Ta "+" Ta "The next window by number"
  .It Li "{previous}" Ta "-" Ta "The previous window by number"
- .It Li "{mouse}" Ta "=" Ta "The window where the mouse event happened"
  .El
  .Pp
  .Ar target-pane
--- 459,464 ----
***************
*** 481,487 ****
  .It Li "{down}" Ta "" Ta "The pane below the active pane"
  .It Li "{left}" Ta "" Ta "The pane to the left of the active pane"
  .It Li "{right}" Ta "" Ta "The pane to the right of the active pane"
- .It Li "{mouse}" Ta "=" Ta "The pane where the mouse event happened"
  .El
  .Pp
  The tokens
--- 488,493 ----
***************
*** 493,498 ****
--- 499,525 ----
  select-window -t:+2
  .Ed
  .Pp
+ In addition,
+ .Em target-session ,
+ .Em target-window
+ or
+ .Em target-pane
+ may consist entirely of the token
+ .Ql {mouse}
+ (alternative form
+ .Ql = )
+ to specify the most recent mouse event
+ (see the
+ .Sx MOUSE SUPPORT
+ section)
+ or
+ .Ql {marked}
+ (alternative form
+ .Ql ~ )
+ to specify the marked pane (see
+ .Ic select-pane
+ .Fl m ) .
+ .Pp
  Sessions, window and panes are each numbered with a unique ID; session IDs are
  prefixed with a
  .Ql $ ,
***************
*** 1440,1445 ****
--- 1467,1479 ----
  .Ar src-pane
  to be joined to left of or above
  .Ar dst-pane .
+ .Pp
+ If
+ .Fl s
+ is omitted and a marked pane is present (see
+ .Ic select-pane
+ .Fl m ) ,
+ the marked pane is used rather than the current pane.
  .It Xo Ic kill-pane
  .Op Fl a
  .Op Fl t Ar target-pane
***************
*** 1795,1801 ****
  .Fl o
  applies the last set layout if possible (undoes the most recent layout change).
  .It Xo Ic select-pane
! .Op Fl DdegLlRU
  .Op Fl P Ar style
  .Op Fl t Ar target-pane
  .Xc
--- 1829,1835 ----
  .Fl o
  applies the last set layout if possible (undoes the most recent layout change).
  .It Xo Ic select-pane
! .Op Fl DdegLlMmRU
  .Op Fl P Ar style
  .Op Fl t Ar target-pane
  .Xc
***************
*** 1823,1828 ****
--- 1857,1876 ----
  .Fl d
  disables input to the pane.
  .Pp
+ .Fl m
+ and
+ .Fl M
+ are used to set and clear the
+ .Em marked pane .
+ There is one marked pane at a time, setting a new marked pane clears the last.
+ The marked pane is the default target for
+ .Fl s
+ to
+ .Ic join-pane ,
+ .Ic swap-pane
+ and
+ .Ic swap-window .
+ .Pp
  Each pane has a style: by default the
  .Ic window-style
  and
***************
*** 1911,1916 ****
--- 1959,1971 ----
  instructs
  .Nm
  not to change the active pane.
+ .Pp
+ If
+ .Fl s
+ is omitted and a marked pane is present (see
+ .Ic select-pane
+ .Fl m ) ,
+ the marked pane is used rather than the current pane.
  .It Xo Ic swap-window
  .Op Fl d
  .Op Fl s Ar src-window
***************
*** 1922,1927 ****
--- 1977,1991 ----
  except the source and destination windows are swapped.
  It is an error if no window exists at
  .Ar src-window .
+ .Pp
+ Like
+ .Ic swap-pane ,
+ if
+ .Fl s
+ is omitted and a marked pane is present (see
+ .Ic select-pane
+ .Fl m ) ,
+ the window containing the marked pane is used rather than the current window.
  .It Xo Ic unlink-window
  .Op Fl k
  .Op Fl t Ar target-window
***************
*** 3488,3493 ****
--- 3552,3558 ----
  .It Li "#" Ta "Window is monitored and activity has been detected."
  .It Li "!" Ta "A bell has occurred in the window."
  .It Li "~" Ta "The window has been silent for the monitor-silence interval."
+ .It Li "M" Ta "The window contains the marked pane."
  .It Li "Z" Ta "The window's active pane is zoomed."
  .El
  .Pp