===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-kill-pane.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -c -r1.10 -r1.11
*** src/usr.bin/tmux/cmd-kill-pane.c	2011/01/04 00:42:46	1.10
--- src/usr.bin/tmux/cmd-kill-pane.c	2012/07/11 07:10:15	1.11
***************
*** 1,4 ****
! /* $OpenBSD: cmd-kill-pane.c,v 1.10 2011/01/04 00:42:46 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 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>
***************
*** 26,32 ****
   * Kill pane.
   */
  
! int	cmd_kill_pane_exec(struct cmd *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_kill_pane_entry = {
  	"kill-pane", "killp",
--- 26,32 ----
   * Kill pane.
   */
  
! enum cmd_retval	 cmd_kill_pane_exec(struct cmd *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_kill_pane_entry = {
  	"kill-pane", "killp",
***************
*** 38,44 ****
  	cmd_kill_pane_exec
  };
  
! int
  cmd_kill_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args		*args = self->args;
--- 38,44 ----
  	cmd_kill_pane_exec
  };
  
! enum cmd_retval
  cmd_kill_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args		*args = self->args;
***************
*** 46,58 ****
  	struct window_pane	*loopwp, *nextwp, *wp;
  
  	if ((wl = cmd_find_pane(ctx, args_get(args, 't'), NULL, &wp)) == NULL)
! 		return (-1);
  
  	if (window_count_panes(wl->window) == 1) {
  		/* Only one pane, kill the window. */
  		server_kill_window(wl->window);
  		recalculate_sizes();
! 		return (0);
  	}
  
  	if (args_has(self->args, 'a')) {
--- 46,58 ----
  	struct window_pane	*loopwp, *nextwp, *wp;
  
  	if ((wl = cmd_find_pane(ctx, args_get(args, 't'), NULL, &wp)) == NULL)
! 		return (CMD_RETURN_ERROR);
  
  	if (window_count_panes(wl->window) == 1) {
  		/* Only one pane, kill the window. */
  		server_kill_window(wl->window);
  		recalculate_sizes();
! 		return (CMD_RETURN_NORMAL);
  	}
  
  	if (args_has(self->args, 'a')) {
***************
*** 71,75 ****
  	}
  	server_redraw_window(wl->window);
  
! 	return (0);
  }
--- 71,75 ----
  	}
  	server_redraw_window(wl->window);
  
! 	return (CMD_RETURN_NORMAL);
  }