===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-kill-window.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -c -r1.11 -r1.12
*** src/usr.bin/tmux/cmd-kill-window.c	2012/05/29 08:12:13	1.11
--- src/usr.bin/tmux/cmd-kill-window.c	2012/07/11 07:10:15	1.12
***************
*** 1,4 ****
! /* $OpenBSD: cmd-kill-window.c,v 1.11 2012/05/29 08:12:13 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-kill-window.c,v 1.12 2012/07/11 07:10:15 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 24,30 ****
   * Destroy window.
   */
  
! int	cmd_kill_window_exec(struct cmd *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_kill_window_entry = {
  	"kill-window", "killw",
--- 24,30 ----
   * Destroy window.
   */
  
! enum cmd_retval	 cmd_kill_window_exec(struct cmd *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_kill_window_entry = {
  	"kill-window", "killw",
***************
*** 36,42 ****
  	cmd_kill_window_exec
  };
  
! int
  cmd_kill_window_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args	*args = self->args;
--- 36,42 ----
  	cmd_kill_window_exec
  };
  
! enum cmd_retval
  cmd_kill_window_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args	*args = self->args;
***************
*** 44,50 ****
  	struct session	*s;
  
  	if ((wl = cmd_find_window(ctx, args_get(args, 't'), &s)) == NULL)
! 		return (-1);
  
  	if (args_has(args, 'a')) {
  		RB_FOREACH_SAFE(wl2, winlinks, &s->windows, wl3) {
--- 44,50 ----
  	struct session	*s;
  
  	if ((wl = cmd_find_window(ctx, args_get(args, 't'), &s)) == NULL)
! 		return (CMD_RETURN_ERROR);
  
  	if (args_has(args, 'a')) {
  		RB_FOREACH_SAFE(wl2, winlinks, &s->windows, wl3) {
***************
*** 55,59 ****
  		server_kill_window(wl->window);
  
  	recalculate_sizes();
! 	return (0);
  }
--- 55,59 ----
  		server_kill_window(wl->window);
  
  	recalculate_sizes();
! 	return (CMD_RETURN_NORMAL);
  }