===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-move-window.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -c -r1.14 -r1.15
*** src/usr.bin/tmux/cmd-move-window.c	2012/07/11 07:10:15	1.14
--- src/usr.bin/tmux/cmd-move-window.c	2013/03/24 09:54:10	1.15
***************
*** 1,4 ****
! /* $OpenBSD: cmd-move-window.c,v 1.14 2012/07/11 07:10:15 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-move-window.c,v 1.15 2013/03/24 09:54:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 26,32 ****
   * Move a window.
   */
  
! enum cmd_retval	 cmd_move_window_exec(struct cmd *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_move_window_entry = {
  	"move-window", "movew",
--- 26,32 ----
   * Move a window.
   */
  
! enum cmd_retval	 cmd_move_window_exec(struct cmd *, struct cmd_q *);
  
  const struct cmd_entry cmd_move_window_entry = {
  	"move-window", "movew",
***************
*** 39,45 ****
  };
  
  enum cmd_retval
! cmd_move_window_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args	*args = self->args;
  	struct session	*src, *dst, *s;
--- 39,45 ----
  };
  
  enum cmd_retval
! cmd_move_window_exec(struct cmd *self, struct cmd_q *cmdq)
  {
  	struct args	*args = self->args;
  	struct session	*src, *dst, *s;
***************
*** 48,54 ****
  	int		 idx, kflag, dflag;
  
  	if (args_has(args, 'r')) {
! 		if ((s = cmd_find_session(ctx, args_get(args, 't'), 0)) == NULL)
  			return (CMD_RETURN_ERROR);
  
  		session_renumber_windows(s);
--- 48,54 ----
  	int		 idx, kflag, dflag;
  
  	if (args_has(args, 'r')) {
! 		if ((s = cmd_find_session(cmdq, args_get(args, 't'), 0)) == NULL)
  			return (CMD_RETURN_ERROR);
  
  		session_renumber_windows(s);
***************
*** 57,71 ****
  		return (CMD_RETURN_NORMAL);
  	}
  
! 	if ((wl = cmd_find_window(ctx, args_get(args, 's'), &src)) == NULL)
  		return (CMD_RETURN_ERROR);
! 	if ((idx = cmd_find_index(ctx, args_get(args, 't'), &dst)) == -2)
  		return (CMD_RETURN_ERROR);
  
  	kflag = args_has(self->args, 'k');
  	dflag = args_has(self->args, 'd');
  	if (server_link_window(src, wl, dst, idx, kflag, !dflag, &cause) != 0) {
! 		ctx->error(ctx, "can't move window: %s", cause);
  		free(cause);
  		return (CMD_RETURN_ERROR);
  	}
--- 57,71 ----
  		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');
  	if (server_link_window(src, wl, dst, idx, kflag, !dflag, &cause) != 0) {
! 		cmdq_error(cmdq, "can't move window: %s", cause);
  		free(cause);
  		return (CMD_RETURN_ERROR);
  	}