===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-kill-window.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -c -r1.8 -r1.9
*** src/usr.bin/tmux/cmd-kill-window.c	2011/01/04 00:42:46	1.8
--- src/usr.bin/tmux/cmd-kill-window.c	2012/04/23 22:10:45	1.9
***************
*** 1,4 ****
! /* $OpenBSD: cmd-kill-window.c,v 1.8 2011/01/04 00:42:46 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-kill-window.c,v 1.9 2012/04/23 22:10:45 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 28,35 ****
  
  const struct cmd_entry cmd_kill_window_entry = {
  	"kill-window", "killw",
! 	"t:", 0, 0,
! 	CMD_TARGET_WINDOW_USAGE,
  	0,
  	NULL,
  	NULL,
--- 28,35 ----
  
  const struct cmd_entry cmd_kill_window_entry = {
  	"kill-window", "killw",
! 	"at:", 0, 0,
! 	"[-a] " CMD_TARGET_WINDOW_USAGE,
  	0,
  	NULL,
  	NULL,
***************
*** 40,52 ****
  cmd_kill_window_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args	*args = self->args;
! 	struct winlink	*wl;
  
  	if ((wl = cmd_find_window(ctx, args_get(args, 't'), NULL)) == NULL)
  		return (-1);
  
! 	server_kill_window(wl->window);
! 	recalculate_sizes();
  
  	return (0);
  }
--- 40,58 ----
  cmd_kill_window_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args	*args = self->args;
! 	struct winlink	*wl, *wl2;
  
  	if ((wl = cmd_find_window(ctx, args_get(args, 't'), NULL)) == NULL)
  		return (-1);
  
! 	if (args_has(args, 'a')) {
! 		RB_FOREACH(wl2, winlinks, &ctx->curclient->session->windows) {
! 			if (wl != wl2)
! 				server_kill_window(wl2->window);
! 		}
! 	} else
! 		server_kill_window(wl->window);
  
+ 	recalculate_sizes();
  	return (0);
  }