===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-select-pane.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/tmux/cmd-select-pane.c	2009/07/26 12:58:44	1.6
--- src/usr.bin/tmux/cmd-select-pane.c	2009/07/30 13:45:56	1.7
***************
*** 1,4 ****
! /* $OpenBSD: cmd-select-pane.c,v 1.6 2009/07/26 12:58:44 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-select-pane.c,v 1.7 2009/07/30 13:45:56 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 28,63 ****
  
  const struct cmd_entry cmd_select_pane_entry = {
  	"select-pane", "selectp",
! 	CMD_PANE_WINDOW_USAGE,
  	0, 0,
! 	cmd_pane_init,
! 	cmd_pane_parse,
  	cmd_select_pane_exec,
! 	cmd_pane_free,
! 	cmd_pane_print
  };
  
  int
  cmd_select_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
! 	struct cmd_pane_data	*data = self->data;
  	struct winlink		*wl;
  	struct window_pane	*wp;
  
! 	if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
  		return (-1);
- 	if (data->pane == -1)
- 		wp = wl->window->active;
- 	else {
- 		wp = window_pane_at_index(wl->window, data->pane);
- 		if (wp == NULL) {
- 			ctx->error(ctx, "no pane: %d", data->pane);
- 			return (-1);
- 		}
- 	}
  
  	if (!window_pane_visible(wp)) {
! 		ctx->error(ctx, "pane %d is not visible", data->pane);
  		return (-1);
  	}
  	window_set_active_pane(wl->window, wp);
--- 28,54 ----
  
  const struct cmd_entry cmd_select_pane_entry = {
  	"select-pane", "selectp",
! 	CMD_TARGET_PANE_USAGE,
  	0, 0,
! 	cmd_target_init,
! 	cmd_target_parse,
  	cmd_select_pane_exec,
! 	cmd_target_free,
! 	cmd_target_print
  };
  
  int
  cmd_select_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
! 	struct cmd_target_data	*data = self->data;
  	struct winlink		*wl;
  	struct window_pane	*wp;
  
! 	if ((wl = cmd_find_pane(ctx, data->target, NULL, &wp)) == NULL)
  		return (-1);
  
  	if (!window_pane_visible(wp)) {
! 		ctx->error(ctx, "pane not visible: %s", data->target);
  		return (-1);
  	}
  	window_set_active_pane(wl->window, wp);