===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-join-pane.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** src/usr.bin/tmux/cmd-join-pane.c	2010/04/04 19:12:20	1.2
--- src/usr.bin/tmux/cmd-join-pane.c	2010/04/17 23:14:17	1.3
***************
*** 1,4 ****
! /* $OpenBSD: cmd-join-pane.c,v 1.2 2010/04/04 19:12:20 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-join-pane.c,v 1.3 2010/04/17 23:14:17 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 151,163 ****
  	struct winlink			*src_wl, *dst_wl;
  	struct window			*src_w, *dst_w;
  	struct window_pane		*src_wp, *dst_wp;
! 	int				 size;
  	enum layout_type		 type;
  	struct layout_cell		*lc;
  
  	if ((dst_wl = cmd_find_pane(ctx, data->dst, &dst_s, &dst_wp)) == NULL)
  		return (-1);
  	dst_w = dst_wl->window;
  
  	if ((src_wl = cmd_find_pane(ctx, data->src, NULL, &src_wp)) == NULL)
  		return (-1);
--- 151,164 ----
  	struct winlink			*src_wl, *dst_wl;
  	struct window			*src_w, *dst_w;
  	struct window_pane		*src_wp, *dst_wp;
! 	int				 size, dst_idx;
  	enum layout_type		 type;
  	struct layout_cell		*lc;
  
  	if ((dst_wl = cmd_find_pane(ctx, data->dst, &dst_s, &dst_wp)) == NULL)
  		return (-1);
  	dst_w = dst_wl->window;
+ 	dst_idx = dst_wl->idx;
  
  	if ((src_wl = cmd_find_pane(ctx, data->src, NULL, &src_wp)) == NULL)
  		return (-1);
***************
*** 210,216 ****
  
  	if (!data->flag_detached) {
  		window_set_active_pane(dst_w, src_wp);
! 		session_select(dst_s, dst_wl->idx);
  		server_redraw_session(dst_s);
  	} else
  		server_status_session(dst_s);
--- 211,217 ----
  
  	if (!data->flag_detached) {
  		window_set_active_pane(dst_w, src_wp);
! 		session_select(dst_s, dst_idx);
  		server_redraw_session(dst_s);
  	} else
  		server_status_session(dst_s);