===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-swap-pane.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -c -r1.13 -r1.14
*** src/usr.bin/tmux/cmd-swap-pane.c	2011/05/08 21:12:52	1.13
--- src/usr.bin/tmux/cmd-swap-pane.c	2012/07/11 07:10:15	1.14
***************
*** 1,4 ****
! /* $OpenBSD: cmd-swap-pane.c,v 1.13 2011/05/08 21:12:52 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-swap-pane.c,v 1.14 2012/07/11 07:10:15 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 26,33 ****
   * Swap two panes.
   */
  
! void	cmd_swap_pane_key_binding(struct cmd *, int);
! int	cmd_swap_pane_exec(struct cmd *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_swap_pane_entry = {
  	"swap-pane", "swapp",
--- 26,33 ----
   * Swap two panes.
   */
  
! void		 cmd_swap_pane_key_binding(struct cmd *, int);
! enum cmd_retval	 cmd_swap_pane_exec(struct cmd *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_swap_pane_entry = {
  	"swap-pane", "swapp",
***************
*** 49,55 ****
  		args_set(self->args, 'D', NULL);
  }
  
! int
  cmd_swap_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args		*args = self->args;
--- 49,55 ----
  		args_set(self->args, 'D', NULL);
  }
  
! enum cmd_retval
  cmd_swap_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args		*args = self->args;
***************
*** 61,67 ****
  
  	dst_wl = cmd_find_pane(ctx, args_get(args, 't'), NULL, &dst_wp);
  	if (dst_wl == NULL)
! 		return (-1);
  	dst_w = dst_wl->window;
  
  	if (!args_has(args, 's')) {
--- 61,67 ----
  
  	dst_wl = cmd_find_pane(ctx, args_get(args, 't'), NULL, &dst_wp);
  	if (dst_wl == NULL)
! 		return (CMD_RETURN_ERROR);
  	dst_w = dst_wl->window;
  
  	if (!args_has(args, 's')) {
***************
*** 75,90 ****
  			if (src_wp == NULL)
  				src_wp = TAILQ_LAST(&dst_w->panes, window_panes);
  		} else
! 			return (0);
  	} else {
  		src_wl = cmd_find_pane(ctx, args_get(args, 's'), NULL, &src_wp);
  		if (src_wl == NULL)
! 			return (-1);
  		src_w = src_wl->window;
  	}
  
  	if (src_wp == dst_wp)
! 		return (0);
  
  	tmp_wp = TAILQ_PREV(dst_wp, window_panes, entry);
  	TAILQ_REMOVE(&dst_w->panes, dst_wp, entry);
--- 75,90 ----
  			if (src_wp == NULL)
  				src_wp = TAILQ_LAST(&dst_w->panes, window_panes);
  		} else
! 			return (CMD_RETURN_NORMAL);
  	} else {
  		src_wl = cmd_find_pane(ctx, args_get(args, 's'), NULL, &src_wp);
  		if (src_wl == NULL)
! 			return (CMD_RETURN_ERROR);
  		src_w = src_wl->window;
  	}
  
  	if (src_wp == dst_wp)
! 		return (CMD_RETURN_NORMAL);
  
  	tmp_wp = TAILQ_PREV(dst_wp, window_panes, entry);
  	TAILQ_REMOVE(&dst_w->panes, dst_wp, entry);
***************
*** 138,142 ****
  	server_redraw_window(src_w);
  	server_redraw_window(dst_w);
  
! 	return (0);
  }
--- 138,142 ----
  	server_redraw_window(src_w);
  	server_redraw_window(dst_w);
  
! 	return (CMD_RETURN_NORMAL);
  }