===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-move-window.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -c -r1.28 -r1.29
*** src/usr.bin/tmux/cmd-move-window.c	2016/10/16 19:04:05	1.28
--- src/usr.bin/tmux/cmd-move-window.c	2017/04/22 10:22:39	1.29
***************
*** 1,4 ****
! /* $OpenBSD: cmd-move-window.c,v 1.28 2016/10/16 19:04:05 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-move-window.c,v 1.29 2017/04/22 10:22:39 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 35,42 ****
  	.args = { "adkrs:t:", 0, 0 },
  	.usage = "[-dkr] " CMD_SRCDST_WINDOW_USAGE,
  
! 	.sflag = CMD_WINDOW,
! 	.tflag = CMD_MOVEW_R,
  
  	.flags = 0,
  	.exec = cmd_move_window_exec
--- 35,42 ----
  	.args = { "adkrs:t:", 0, 0 },
  	.usage = "[-dkr] " CMD_SRCDST_WINDOW_USAGE,
  
! 	.source = { 's', CMD_FIND_WINDOW, 0 },
! 	/* -t is special */
  
  	.flags = 0,
  	.exec = cmd_move_window_exec
***************
*** 49,56 ****
  	.args = { "adks:t:", 0, 0 },
  	.usage = "[-dk] " CMD_SRCDST_WINDOW_USAGE,
  
! 	.sflag = CMD_WINDOW,
! 	.tflag = CMD_WINDOW_INDEX,
  
  	.flags = 0,
  	.exec = cmd_move_window_exec
--- 49,56 ----
  	.args = { "adks:t:", 0, 0 },
  	.usage = "[-dk] " CMD_SRCDST_WINDOW_USAGE,
  
! 	.source = { 's', CMD_FIND_WINDOW, 0 },
! 	/* -t is special */
  
  	.flags = 0,
  	.exec = cmd_move_window_exec
***************
*** 60,77 ****
  cmd_move_window_exec(struct cmd *self, struct cmdq_item *item)
  {
  	struct args	*args = self->args;
! 	struct session	*src = item->state.sflag.s;
! 	struct session	*dst = item->state.tflag.s;
! 	struct winlink	*wl = item->state.sflag.wl;
  	char		*cause;
! 	int		 idx = item->state.tflag.idx, kflag, dflag, sflag;
  
  	if (args_has(args, 'r')) {
! 		session_renumber_windows(dst);
  		recalculate_sizes();
  
  		return (CMD_RETURN_NORMAL);
  	}
  
  	kflag = args_has(self->args, 'k');
  	dflag = args_has(self->args, 'd');
--- 60,90 ----
  cmd_move_window_exec(struct cmd *self, struct cmdq_item *item)
  {
  	struct args	*args = self->args;
! 	const char	*tflag = args_get(args, 't');
! 	struct session	*src;
! 	struct session	*dst;
! 	struct winlink	*wl;
  	char		*cause;
! 	int		 idx, kflag, dflag, sflag;
  
  	if (args_has(args, 'r')) {
! 		if (cmd_find_target(&item->target, item, tflag,
! 		    CMD_FIND_SESSION, CMD_FIND_QUIET) != 0)
! 			return (CMD_RETURN_ERROR);
! 
! 		session_renumber_windows(item->target.s);
  		recalculate_sizes();
+ 		server_status_session(item->target.s);
  
  		return (CMD_RETURN_NORMAL);
  	}
+ 	if (cmd_find_target(&item->target, item, tflag, CMD_FIND_WINDOW,
+ 	    CMD_FIND_WINDOW_INDEX) != 0)
+ 		return (CMD_RETURN_ERROR);
+ 	src = item->source.s;
+ 	dst = item->target.s;
+ 	wl = item->source.wl;
+ 	idx = item->target.idx;
  
  	kflag = args_has(self->args, 'k');
  	dflag = args_has(self->args, 'd');