===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-swap-window.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -c -r1.22 -r1.23
*** src/usr.bin/tmux/cmd-swap-window.c	2017/02/09 15:04:53	1.22
--- src/usr.bin/tmux/cmd-swap-window.c	2017/04/22 10:22:39	1.23
***************
*** 1,4 ****
! /* $OpenBSD: cmd-swap-window.c,v 1.22 2017/02/09 15:04:53 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-swap-window.c,v 1.23 2017/04/22 10:22:39 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 35,42 ****
  	.args = { "ds:t:", 0, 0 },
  	.usage = "[-d] " CMD_SRCDST_WINDOW_USAGE,
  
! 	.sflag = CMD_WINDOW_MARKED,
! 	.tflag = CMD_WINDOW,
  
  	.flags = 0,
  	.exec = cmd_swap_window_exec
--- 35,42 ----
  	.args = { "ds:t:", 0, 0 },
  	.usage = "[-d] " CMD_SRCDST_WINDOW_USAGE,
  
! 	.source = { 's', CMD_FIND_WINDOW, CMD_FIND_DEFAULT_MARKED },
! 	.target = { 't', CMD_FIND_WINDOW, 0 },
  
  	.flags = 0,
  	.exec = cmd_swap_window_exec
***************
*** 50,61 ****
  	struct winlink		*wl_src, *wl_dst;
  	struct window		*w_src, *w_dst;
  
! 	wl_src = item->state.sflag.wl;
! 	src = item->state.sflag.s;
  	sg_src = session_group_contains(src);
  
! 	wl_dst = item->state.tflag.wl;
! 	dst = item->state.tflag.s;
  	sg_dst = session_group_contains(dst);
  
  	if (src != dst && sg_src != NULL && sg_dst != NULL &&
--- 50,61 ----
  	struct winlink		*wl_src, *wl_dst;
  	struct window		*w_src, *w_dst;
  
! 	wl_src = item->source.wl;
! 	src = item->source.s;
  	sg_src = session_group_contains(src);
  
! 	wl_dst = item->target.wl;
! 	dst = item->target.s;
  	sg_dst = session_group_contains(dst);
  
  	if (src != dst && sg_src != NULL && sg_dst != NULL &&