From 9ec457575d0db6450d8a436426b4a705c49285aa Mon Sep 17 00:00:00 2001
From: Tiago Cunha <tcunha@gmx.com>
Date: Fri, 25 Nov 2011 13:30:45 +0000
Subject: Sync OpenBSD patchset 979:

Make window_pane_index work the same as window_index, from Ben Boeckel.
---
 status.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'status.c')

diff --git a/status.c b/status.c
index 5db40b4b..ca3e9d43 100644
--- a/status.c
+++ b/status.c
@@ -372,6 +372,7 @@ status_replace1(struct client *c, struct session *s, struct winlink *wl,
 	char	ch, tmp[256], *ptr, *endptr, *freeptr;
 	size_t	ptrlen;
 	long	limit;
+	u_int	idx;
 
 	if (s == NULL)
 		s = c->session;
@@ -422,8 +423,10 @@ status_replace1(struct client *c, struct session *s, struct winlink *wl,
 		ptr = tmp;
 		goto do_replace;
 	case 'P':
+		if (window_pane_index(wp, &idx) != 0)
+			fatalx("index not found");
 		xsnprintf(
-		    tmp, sizeof tmp, "%u", window_pane_index(wl->window, wp));
+		    tmp, sizeof tmp, "%u", idx);
 		ptr = tmp;
 		goto do_replace;
 	case 'S':
-- 
cgit