Sync OpenBSD patchset 950:

Add pane-base-index option, from Ben Barbour.

3 files changed, 15 insertions, 3 deletions

diff --git a/options-table.c b/options-table.c
index d289ca21..0832117b 100644
--- a/options-table.c
+++ b/options-table.c
@@ -522,6 +522,13 @@ const struct options_table_entry window_options_table[] = {
 	  .default_num = 0
 	},
 
+	{ .name = "pane-base-index",
+	  .type = OPTIONS_TABLE_NUMBER,
+	  .minimum = 0,
+	  .maximum = USHRT_MAX,
+	  .default_num = 0
+	},
+
 	{ .name = "remain-on-exit",
 	  .type = OPTIONS_TABLE_FLAG,
 	  .default_num = 0
diff --git a/tmux.1 b/tmux.1
index ff7b9f87..a6b79e0c 100644
--- a/tmux.1
+++ b/tmux.1
@@ -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: August 16 2011 $
+.Dd $Mdocdate: August 24 2011 $
 .Dt TMUX 1
 .Os
 .Sh NAME
@@ -2422,6 +2422,11 @@ but set the width of other panes in the
 .Ic main-vertical
 layout.
 .Pp
+.It Ic pane-base-index Ar index
+Like
+.Ic base-index ,
+but set the starting index for pane numbers.
+.Pp
 .It Xo Ic remain-on-exit
 .Op Ic on | off
 .Xc
diff --git a/window.c b/window.c
index 4b5f9016..d589405b 100644
--- a/window.c
+++ b/window.c
@@ -451,7 +451,7 @@ window_pane_at_index(struct window *w, u_int idx)
 	struct window_pane	*wp;
 	u_int			 n;
 
-	n = 0;
+	n = options_get_number(&w->options, "pane-base-index");
 	TAILQ_FOREACH(wp, &w->panes, entry) {
 		if (n == idx)
 			return (wp);
@@ -489,7 +489,7 @@ window_pane_index(struct window *w, struct window_pane *wp)
 	struct window_pane	*wq;
 	u_int			 n;
 
-	n = 0;
+	n = options_get_number(&w->options, "pane-base-index");
 	TAILQ_FOREACH(wq, &w->panes, entry) {
 		if (wp == wq)
 			break;