===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-swap-window.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -c -r1.19 -r1.20
*** src/usr.bin/tmux/cmd-swap-window.c	2016/10/13 22:48:51	1.19
--- src/usr.bin/tmux/cmd-swap-window.c	2016/10/16 19:04:05	1.20
***************
*** 1,4 ****
! /* $OpenBSD: cmd-swap-window.c,v 1.19 2016/10/13 22:48:51 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-swap-window.c,v 1.20 2016/10/16 19:04:05 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 26,32 ****
   * Swap one window with another.
   */
  
! static enum cmd_retval	cmd_swap_window_exec(struct cmd *, struct cmd_q *);
  
  const struct cmd_entry cmd_swap_window_entry = {
  	.name = "swap-window",
--- 26,32 ----
   * Swap one window with another.
   */
  
! static enum cmd_retval	cmd_swap_window_exec(struct cmd *, struct cmdq_item *);
  
  const struct cmd_entry cmd_swap_window_entry = {
  	.name = "swap-window",
***************
*** 43,66 ****
  };
  
  static enum cmd_retval
! cmd_swap_window_exec(struct cmd *self, struct cmd_q *cmdq)
  {
  	struct session		*src, *dst;
  	struct session_group	*sg_src, *sg_dst;
  	struct winlink		*wl_src, *wl_dst;
  	struct window		*w;
  
! 	wl_src = cmdq->state.sflag.wl;
! 	src = cmdq->state.sflag.s;
  	sg_src = session_group_find(src);
  
! 	wl_dst = cmdq->state.tflag.wl;
! 	dst = cmdq->state.tflag.s;
  	sg_dst = session_group_find(dst);
  
  	if (src != dst && sg_src != NULL && sg_dst != NULL &&
  	    sg_src == sg_dst) {
! 		cmdq_error(cmdq, "can't move window, sessions are grouped");
  		return (CMD_RETURN_ERROR);
  	}
  
--- 43,66 ----
  };
  
  static enum cmd_retval
! cmd_swap_window_exec(struct cmd *self, struct cmdq_item *item)
  {
  	struct session		*src, *dst;
  	struct session_group	*sg_src, *sg_dst;
  	struct winlink		*wl_src, *wl_dst;
  	struct window		*w;
  
! 	wl_src = item->state.sflag.wl;
! 	src = item->state.sflag.s;
  	sg_src = session_group_find(src);
  
! 	wl_dst = item->state.tflag.wl;
! 	dst = item->state.tflag.s;
  	sg_dst = session_group_find(dst);
  
  	if (src != dst && sg_src != NULL && sg_dst != NULL &&
  	    sg_src == sg_dst) {
! 		cmdq_error(item, "can't move window, sessions are grouped");
  		return (CMD_RETURN_ERROR);
  	}