===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-kill-pane.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- src/usr.bin/tmux/cmd-kill-pane.c	2009/09/20 17:27:18	1.7
+++ src/usr.bin/tmux/cmd-kill-pane.c	2009/10/24 10:12:39	1.8
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-kill-pane.c,v 1.7 2009/09/20 17:27:18 nicm Exp $ */
+/* $OpenBSD: cmd-kill-pane.c,v 1.8 2009/10/24 10:12:39 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -30,8 +30,8 @@
 
 const struct cmd_entry cmd_kill_pane_entry = {
 	"kill-pane", "killp",
-	CMD_TARGET_PANE_USAGE,
-	0, 0,
+	"[-a] " CMD_TARGET_PANE_USAGE,
+	0, CMD_CHFLAG('a'),
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_kill_pane_exec,
@@ -44,7 +44,7 @@
 {
 	struct cmd_target_data	*data = self->data;
 	struct winlink		*wl;
-	struct window_pane	*wp;
+	struct window_pane	*loopwp, *nextwp, *wp;
 
 	if ((wl = cmd_find_pane(ctx, data->target, NULL, &wp)) == NULL)
 		return (-1);
@@ -56,8 +56,21 @@
 		return (0);
 	}
 
-	layout_close_pane(wp);
-	window_remove_pane(wl->window, wp);
+	if (data->chflags & CMD_CHFLAG('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);
+		window_remove_pane(wl->window, wp);
+	}
 	server_redraw_window(wl->window);
+
 	return (0);
 }