===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-move-window.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -c -r1.21 -r1.22
*** src/usr.bin/tmux/cmd-move-window.c	2015/10/27 15:58:42	1.21
--- src/usr.bin/tmux/cmd-move-window.c	2015/12/13 14:32:38	1.22
***************
*** 1,4 ****
! /* $OpenBSD: cmd-move-window.c,v 1.21 2015/10/27 15:58:42 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-move-window.c,v 1.22 2015/12/13 14:32:38 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 32,38 ****
  	"move-window", "movew",
  	"adkrs:t:", 0, 0,
  	"[-dkr] " CMD_SRCDST_WINDOW_USAGE,
! 	0,
  	cmd_move_window_exec
  };
  
--- 32,38 ----
  	"move-window", "movew",
  	"adkrs:t:", 0, 0,
  	"[-dkr] " CMD_SRCDST_WINDOW_USAGE,
! 	CMD_WINDOW_S|CMD_MOVEW_R|CMD_INDEX_T,
  	cmd_move_window_exec
  };
  
***************
*** 40,46 ****
  	"link-window", "linkw",
  	"adks:t:", 0, 0,
  	"[-dk] " CMD_SRCDST_WINDOW_USAGE,
! 	0,
  	cmd_move_window_exec
  };
  
--- 40,46 ----
  	"link-window", "linkw",
  	"adks:t:", 0, 0,
  	"[-dk] " CMD_SRCDST_WINDOW_USAGE,
! 	CMD_WINDOW_S|CMD_INDEX_T,
  	cmd_move_window_exec
  };
  
***************
*** 48,83 ****
  cmd_move_window_exec(struct cmd *self, struct cmd_q *cmdq)
  {
  	struct args	*args = self->args;
! 	struct session	*src, *dst, *s;
! 	struct winlink	*wl;
  	char		*cause;
! 	int		 idx, kflag, dflag, sflag;
  
! 	if (args_has(args, 'r')) {
! 		s = cmd_find_session(cmdq, args_get(args, 't'), 0);
! 		if (s == NULL)
! 			return (CMD_RETURN_ERROR);
  
! 		session_renumber_windows(s);
  		recalculate_sizes();
  
  		return (CMD_RETURN_NORMAL);
  	}
  
- 	if ((wl = cmd_find_window(cmdq, args_get(args, 's'), &src)) == NULL)
- 		return (CMD_RETURN_ERROR);
- 	if ((idx = cmd_find_index(cmdq, args_get(args, 't'), &dst)) == -2)
- 		return (CMD_RETURN_ERROR);
- 
  	kflag = args_has(self->args, 'k');
  	dflag = args_has(self->args, 'd');
  	sflag = args_has(self->args, 's');
  
  	if (args_has(self->args, 'a')) {
! 		s = cmd_find_session(cmdq, args_get(args, 't'), 0);
! 		if (s == NULL)
! 			return (CMD_RETURN_ERROR);
! 		if ((idx = winlink_shuffle_up(s, s->curw)) == -1)
  			return (CMD_RETURN_ERROR);
  	}
  
--- 48,75 ----
  cmd_move_window_exec(struct cmd *self, struct cmd_q *cmdq)
  {
  	struct args	*args = self->args;
! 	struct session	*src = cmdq->state.sflag.s;
! 	struct session	*dst = cmdq->state.tflag.s;
! 	struct winlink	*wl = cmdq->state.sflag.wl;
  	char		*cause;
! 	int		 idx = cmdq->state.tflag.idx, kflag, dflag, sflag;
  
! 	kflag = args_has(self->args, 'k');
! 	dflag = args_has(self->args, 'd');
  
! 	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');
  	sflag = args_has(self->args, 's');
  
  	if (args_has(self->args, 'a')) {
! 		if ((idx = winlink_shuffle_up(dst, dst->curw)) == -1)
  			return (CMD_RETURN_ERROR);
  	}