From 1caa73afb4da381425160cbff68284a4dab1470b Mon Sep 17 00:00:00 2001
From: Tiago Cunha <tcunha@gmx.com>
Date: Fri, 4 Dec 2009 22:11:23 +0000
Subject: Sync OpenBSD patchset 580:

Eliminate duplicate code and ease the passage for server-wide options by adding
a -w flag to set-option and show-options and making setw and showw aliases to
set -w and show -w.

Note: setw and showw are still there, but now aliases for set -w and show -w.
---
 tmux.1 | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

(limited to 'tmux.1')

diff --git a/tmux.1 b/tmux.1
index 5386dfd3..7e210776 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1,4 +1,4 @@
-.\" $Id: tmux.1,v 1.210 2009-12-02 15:10:44 tcunha Exp $
+.\" $Id: tmux.1,v 1.211 2009-12-04 22:11:23 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: December 1 2009 $
+.Dd $Mdocdate: December 3 2009 $
 .Dt TMUX 1
 .Os
 .Sh NAME
@@ -1230,8 +1230,8 @@ command.
 Commands which set options are as follows:
 .Bl -tag -width Ds
 .It Xo Ic set-option
-.Op Fl agu
-.Op Fl t Ar target-session
+.Op Fl aguw
+.Op Fl t Ar target-session | Ar target-window
 .Ar option Ar value
 .Xc
 .D1 (alias: Ic set )
@@ -1249,6 +1249,13 @@ The
 flag unsets an option, so a session inherits the option from the global
 options - it is not possible to unset a global option.
 .Pp
+With
+.Fl w ,
+this command is equivalent to
+.Ic set-window-option 
+with
+.Ar target-window .
+.Pp
 Available session options are:
 .Bl -tag -width Ds
 .It Ic base-index Ar index
@@ -1831,14 +1838,21 @@ as Shift, Alt or Ctrl.
 The default is off.
 .El
 .It Xo Ic show-options
-.Op Fl g
-.Op Fl t Ar target-session
+.Op Fl gw
+.Op Fl t Ar target-session | Ar target-window
 .Xc
 .D1 (alias: Ic show )
 Show the session options for
 .Ar target session ,
 or the global session options with
 .Fl g .
+.Pp
+If
+.Fl w
+is used, this command is equivalent to
+.Ic show-window-options 
+with
+.Ar target-window .
 .It Xo Ic show-window-options
 .Op Fl g
 .Op Fl t Ar target-window
-- 
cgit