===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-move-window.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/tmux/cmd-move-window.c	2009/11/13 19:53:29	1.9
--- src/usr.bin/tmux/cmd-move-window.c	2011/01/04 00:42:47	1.10
***************
*** 1,4 ****
! /* $OpenBSD: cmd-move-window.c,v 1.9 2009/11/13 19:53:29 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-move-window.c,v 1.10 2011/01/04 00:42:47 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 30,60 ****
  
  const struct cmd_entry cmd_move_window_entry = {
  	"move-window", "movew",
  	"[-dk] " CMD_SRCDST_WINDOW_USAGE,
! 	0, "dk",
! 	cmd_srcdst_init,
! 	cmd_srcdst_parse,
! 	cmd_move_window_exec,
! 	cmd_srcdst_free,
! 	cmd_srcdst_print
  };
  
  int
  cmd_move_window_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
! 	struct cmd_srcdst_data	*data = self->data;
! 	struct session		*src, *dst;
! 	struct winlink		*wl;
! 	char			*cause;
! 	int			 idx, kflag, dflag;
  
! 	if ((wl = cmd_find_window(ctx, data->src, &src)) == NULL)
  		return (-1);
! 	if ((idx = cmd_find_index(ctx, data->dst, &dst)) == -2)
  		return (-1);
  
! 	kflag = cmd_check_flag(data->chflags, 'k');
! 	dflag = cmd_check_flag(data->chflags, 'd');
  	if (server_link_window(src, wl, dst, idx, kflag, !dflag, &cause) != 0) {
  		ctx->error(ctx, "can't move window: %s", cause);
  		xfree(cause);
--- 30,59 ----
  
  const struct cmd_entry cmd_move_window_entry = {
  	"move-window", "movew",
+ 	"dks:t:", 0, 0,
  	"[-dk] " CMD_SRCDST_WINDOW_USAGE,
! 	0,
! 	NULL,
! 	NULL,
! 	cmd_move_window_exec
  };
  
  int
  cmd_move_window_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
! 	struct args	*args = self->args;
! 	struct session	*src, *dst;
! 	struct winlink	*wl;
! 	char		*cause;
! 	int		 idx, kflag, dflag;
  
! 	if ((wl = cmd_find_window(ctx, args_get(args, 's'), &src)) == NULL)
  		return (-1);
! 	if ((idx = cmd_find_index(ctx, args_get(args, 't'), &dst)) == -2)
  		return (-1);
  
! 	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);
  		xfree(cause);