===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-join-pane.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -c -r1.31 -r1.32
*** src/usr.bin/tmux/cmd-join-pane.c	2017/04/22 08:56:24	1.31
--- src/usr.bin/tmux/cmd-join-pane.c	2017/04/22 10:22:39	1.32
***************
*** 1,4 ****
! /* $OpenBSD: cmd-join-pane.c,v 1.31 2017/04/22 08:56:24 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 George Nachman <tmux@georgester.com>
--- 1,4 ----
! /* $OpenBSD: cmd-join-pane.c,v 1.32 2017/04/22 10:22:39 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 George Nachman <tmux@georgester.com>
***************
*** 38,45 ****
  	.args = { "bdhvp:l:s:t:", 0, 0 },
  	.usage = "[-bdhv] [-p percentage|-l size] " CMD_SRCDST_PANE_USAGE,
  
! 	.sflag = CMD_PANE_MARKED,
! 	.tflag = CMD_PANE,
  
  	.flags = 0,
  	.exec = cmd_join_pane_exec
--- 38,45 ----
  	.args = { "bdhvp:l:s:t:", 0, 0 },
  	.usage = "[-bdhv] [-p percentage|-l size] " CMD_SRCDST_PANE_USAGE,
  
! 	.source = { 's', CMD_FIND_PANE, CMD_FIND_DEFAULT_MARKED },
! 	.target = { 't', CMD_FIND_PANE, 0 },
  
  	.flags = 0,
  	.exec = cmd_join_pane_exec
***************
*** 52,59 ****
  	.args = { "bdhvp:l:s:t:", 0, 0 },
  	.usage = "[-bdhv] [-p percentage|-l size] " CMD_SRCDST_PANE_USAGE,
  
! 	.sflag = CMD_PANE,
! 	.tflag = CMD_PANE,
  
  	.flags = 0,
  	.exec = cmd_join_pane_exec
--- 52,59 ----
  	.args = { "bdhvp:l:s:t:", 0, 0 },
  	.usage = "[-bdhv] [-p percentage|-l size] " CMD_SRCDST_PANE_USAGE,
  
! 	.source = { 's', CMD_FIND_PANE, 0 },
! 	.target = { 't', CMD_FIND_PANE, 0 },
  
  	.flags = 0,
  	.exec = cmd_join_pane_exec
***************
*** 79,93 ****
  	else
  		not_same_window = 0;
  
! 	dst_s = item->state.tflag.s;
! 	dst_wl = item->state.tflag.wl;
! 	dst_wp = item->state.tflag.wp;
  	dst_w = dst_wl->window;
  	dst_idx = dst_wl->idx;
  	server_unzoom_window(dst_w);
  
! 	src_wl = item->state.sflag.wl;
! 	src_wp = item->state.sflag.wp;
  	src_w = src_wl->window;
  	server_unzoom_window(src_w);
  
--- 79,93 ----
  	else
  		not_same_window = 0;
  
! 	dst_s = item->target.s;
! 	dst_wl = item->target.wl;
! 	dst_wp = item->target.wp;
  	dst_w = dst_wl->window;
  	dst_idx = dst_wl->idx;
  	server_unzoom_window(dst_w);
  
! 	src_wl = item->source.wl;
! 	src_wp = item->source.wp;
  	src_w = src_wl->window;
  	server_unzoom_window(src_w);