===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-move-window.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** src/usr.bin/tmux/cmd-move-window.c	2009/06/01 22:58:49	1.1
--- src/usr.bin/tmux/cmd-move-window.c	2009/07/13 17:47:46	1.2
***************
*** 1,4 ****
! /* $OpenBSD: cmd-move-window.c,v 1.1 2009/06/01 22:58:49 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-move-window.c,v 1.2 2009/07/13 17:47:46 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 54,72 ****
  
  	if ((wl_src = cmd_find_window(ctx, data->src, &src)) == NULL)
  		return (-1);
! 
! 	if (arg_parse_window(data->dst, &dst, &idx) != 0) {
! 		ctx->error(ctx, "bad window: %s", data->dst);
  		return (-1);
- 	}
- 	if (dst == NULL)
- 		dst = ctx->cursession;
- 	if (dst == NULL)
- 		dst = cmd_current_session(ctx);
- 	if (dst == NULL) {
- 		ctx->error(ctx, "session not found: %s", data->dst);
- 		return (-1);
- 	}
  
  	wl_dst = NULL;
  	if (idx != -1)
--- 54,61 ----
  
  	if ((wl_src = cmd_find_window(ctx, data->src, &src)) == NULL)
  		return (-1);
! 	if ((idx = cmd_find_index(ctx, data->dst, &dst)) == -2)
  		return (-1);
  
  	wl_dst = NULL;
  	if (idx != -1)