===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-swap-window.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/tmux/cmd-swap-window.c	2011/01/04 00:42:47	1.6
--- src/usr.bin/tmux/cmd-swap-window.c	2012/07/11 07:10:15	1.7
***************
*** 1,4 ****
! /* $OpenBSD: cmd-swap-window.c,v 1.6 2011/01/04 00:42:47 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-swap-window.c,v 1.7 2012/07/11 07:10:15 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 38,44 ****
  	cmd_swap_window_exec
  };
  
! int
  cmd_swap_window_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args		*args = self->args;
--- 38,44 ----
  	cmd_swap_window_exec
  };
  
! enum cmd_retval
  cmd_swap_window_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args		*args = self->args;
***************
*** 50,70 ****
  
  	target_src = args_get(args, 's');
  	if ((wl_src = cmd_find_window(ctx, target_src, &src)) == NULL)
! 		return (-1);
  	target_dst = args_get(args, 't');
  	if ((wl_dst = cmd_find_window(ctx, target_dst, &dst)) == NULL)
! 		return (-1);
  
  	sg_src = session_group_find(src);
  	sg_dst = session_group_find(dst);
  	if (src != dst &&
  	    sg_src != NULL && sg_dst != NULL && sg_src == sg_dst) {
  		ctx->error(ctx, "can't move window, sessions are grouped");
! 		return (-1);
  	}
  
  	if (wl_dst->window == wl_src->window)
! 		return (0);
  
  	w = wl_dst->window;
  	wl_dst->window = wl_src->window;
--- 50,70 ----
  
  	target_src = args_get(args, 's');
  	if ((wl_src = cmd_find_window(ctx, target_src, &src)) == NULL)
! 		return (CMD_RETURN_ERROR);
  	target_dst = args_get(args, 't');
  	if ((wl_dst = cmd_find_window(ctx, target_dst, &dst)) == NULL)
! 		return (CMD_RETURN_ERROR);
  
  	sg_src = session_group_find(src);
  	sg_dst = session_group_find(dst);
  	if (src != dst &&
  	    sg_src != NULL && sg_dst != NULL && sg_src == sg_dst) {
  		ctx->error(ctx, "can't move window, sessions are grouped");
! 		return (CMD_RETURN_ERROR);
  	}
  
  	if (wl_dst->window == wl_src->window)
! 		return (CMD_RETURN_NORMAL);
  
  	w = wl_dst->window;
  	wl_dst->window = wl_src->window;
***************
*** 83,87 ****
  	}
  	recalculate_sizes();
  
! 	return (0);
  }
--- 83,87 ----
  	}
  	recalculate_sizes();
  
! 	return (CMD_RETURN_NORMAL);
  }