===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-swap-window.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** src/usr.bin/tmux/cmd-swap-window.c	2009/10/10 10:02:48	1.4
--- src/usr.bin/tmux/cmd-swap-window.c	2009/11/13 19:53:29	1.5
***************
*** 1,4 ****
! /* $OpenBSD: cmd-swap-window.c,v 1.4 2009/10/10 10:02:48 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-swap-window.c,v 1.5 2009/11/13 19:53:29 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 31,37 ****
  const struct cmd_entry cmd_swap_window_entry = {
  	"swap-window", "swapw",
  	"[-d] " CMD_SRCDST_WINDOW_USAGE,
! 	0, CMD_CHFLAG('d'),
  	cmd_srcdst_init,
  	cmd_srcdst_parse,
  	cmd_swap_window_exec,
--- 31,37 ----
  const struct cmd_entry cmd_swap_window_entry = {
  	"swap-window", "swapw",
  	"[-d] " CMD_SRCDST_WINDOW_USAGE,
! 	0, "d",
  	cmd_srcdst_init,
  	cmd_srcdst_parse,
  	cmd_swap_window_exec,
***************
*** 68,74 ****
  	wl_dst->window = wl_src->window;
  	wl_src->window = w;
  
! 	if (!(data->chflags & CMD_CHFLAG('d'))) {
  		session_select(dst, wl_dst->idx);
  		if (src != dst)
  			session_select(src, wl_src->idx);
--- 68,74 ----
  	wl_dst->window = wl_src->window;
  	wl_src->window = w;
  
! 	if (!cmd_check_flag(data->chflags, 'd')) {
  		session_select(dst, wl_dst->idx);
  		if (src != dst)
  			session_select(src, wl_src->idx);