===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-swap-window.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** src/usr.bin/tmux/cmd-swap-window.c	2019/05/09 08:39:09	1.24
--- src/usr.bin/tmux/cmd-swap-window.c	2019/08/26 16:35:41	1.25
***************
*** 1,4 ****
! /* $OpenBSD: cmd-swap-window.c,v 1.24 2019/05/09 08:39:09 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-swap-window.c,v 1.25 2019/08/26 16:35:41 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 77,86 ****
  	wl_src->window = w_dst;
  	TAILQ_INSERT_TAIL(&w_dst->winlinks, wl_src, wentry);
  
! 	if (!args_has(self->args, 'd')) {
! 		session_select(src, wl_src->idx);
  		if (src != dst)
! 			session_select(dst, wl_dst->idx);
  	}
  	session_group_synchronize_from(src);
  	server_redraw_session_group(src);
--- 77,86 ----
  	wl_src->window = w_dst;
  	TAILQ_INSERT_TAIL(&w_dst->winlinks, wl_src, wentry);
  
! 	if (args_has(self->args, 'd')) {
! 		session_select(dst, wl_dst->idx);
  		if (src != dst)
! 			session_select(src, wl_src->idx);
  	}
  	session_group_synchronize_from(src);
  	server_redraw_session_group(src);