===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-kill-pane.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -c -r1.11 -r1.12
*** src/usr.bin/tmux/cmd-kill-pane.c	2012/07/11 07:10:15	1.11
--- src/usr.bin/tmux/cmd-kill-pane.c	2012/08/14 08:15:00	1.12
***************
*** 1,4 ****
! /* $OpenBSD: cmd-kill-pane.c,v 1.11 2012/07/11 07:10:15 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-kill-pane.c,v 1.12 2012/08/14 08:15:00 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 43,49 ****
  {
  	struct args		*args = self->args;
  	struct winlink		*wl;
! 	struct window_pane	*loopwp, *nextwp, *wp;
  
  	if ((wl = cmd_find_pane(ctx, args_get(args, 't'), NULL, &wp)) == NULL)
  		return (CMD_RETURN_ERROR);
--- 43,49 ----
  {
  	struct args		*args = self->args;
  	struct winlink		*wl;
! 	struct window_pane	*loopwp, *tmpwp, *wp;
  
  	if ((wl = cmd_find_pane(ctx, args_get(args, 't'), NULL, &wp)) == NULL)
  		return (CMD_RETURN_ERROR);
***************
*** 56,69 ****
  	}
  
  	if (args_has(self->args, 'a')) {
! 		loopwp = TAILQ_FIRST(&wl->window->panes);
! 		while (loopwp != NULL) {
! 			nextwp = TAILQ_NEXT(loopwp, entry);
! 			if (loopwp != wp) {
! 				layout_close_pane(loopwp);
! 				window_remove_pane(wl->window, loopwp);
! 			}
! 			loopwp = nextwp;
  		}
  	} else {
  		layout_close_pane(wp);
--- 56,66 ----
  	}
  
  	if (args_has(self->args, 'a')) {
! 		TAILQ_FOREACH_SAFE(loopwp, &wl->window->panes, entry, tmpwp) {
! 			if (loopwp == wp)
! 				continue;
! 			layout_close_pane(loopwp);
! 			window_remove_pane(wl->window, loopwp);
  		}
  	} else {
  		layout_close_pane(wp);