===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -c -r1.66 -r1.67
*** src/usr.bin/tmux/window.c	2011/06/05 10:53:05	1.66
--- src/usr.bin/tmux/window.c	2011/08/24 10:29:57	1.67
***************
*** 1,4 ****
! /* $OpenBSD: window.c,v 1.66 2011/06/05 10:53:05 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: window.c,v 1.67 2011/08/24 10:29:57 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 454,460 ****
  	struct window_pane	*wp;
  	u_int			 n;
  
! 	n = 0;
  	TAILQ_FOREACH(wp, &w->panes, entry) {
  		if (n == idx)
  			return (wp);
--- 454,460 ----
  	struct window_pane	*wp;
  	u_int			 n;
  
! 	n = options_get_number(&w->options, "pane-base-index");
  	TAILQ_FOREACH(wp, &w->panes, entry) {
  		if (n == idx)
  			return (wp);
***************
*** 492,498 ****
  	struct window_pane	*wq;
  	u_int			 n;
  
! 	n = 0;
  	TAILQ_FOREACH(wq, &w->panes, entry) {
  		if (wp == wq)
  			break;
--- 492,498 ----
  	struct window_pane	*wq;
  	u_int			 n;
  
! 	n = options_get_number(&w->options, "pane-base-index");
  	TAILQ_FOREACH(wq, &w->panes, entry) {
  		if (wp == wq)
  			break;