===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-join-pane.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -c -r1.25 -r1.26
*** src/usr.bin/tmux/cmd-join-pane.c	2016/09/04 17:37:06	1.25
--- src/usr.bin/tmux/cmd-join-pane.c	2016/10/10 21:51:39	1.26
***************
*** 1,4 ****
! /* $OpenBSD: cmd-join-pane.c,v 1.25 2016/09/04 17:37:06 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 George Nachman <tmux@georgester.com>
--- 1,4 ----
! /* $OpenBSD: cmd-join-pane.c,v 1.26 2016/10/10 21:51:39 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 George Nachman <tmux@georgester.com>
***************
*** 29,38 ****
   * Join or move a pane into another (like split/swap/kill).
   */
  
! enum cmd_retval	 cmd_join_pane_exec(struct cmd *, struct cmd_q *);
  
- enum cmd_retval	 join_pane(struct cmd *, struct cmd_q *, int);
- 
  const struct cmd_entry cmd_join_pane_entry = {
  	.name = "join-pane",
  	.alias = "joinp",
--- 29,36 ----
   * Join or move a pane into another (like split/swap/kill).
   */
  
! static enum cmd_retval	 cmd_join_pane_exec(struct cmd *, struct cmd_q *);
  
  const struct cmd_entry cmd_join_pane_entry = {
  	.name = "join-pane",
  	.alias = "joinp",
***************
*** 61,75 ****
  	.exec = cmd_join_pane_exec
  };
  
! enum cmd_retval
  cmd_join_pane_exec(struct cmd *self, struct cmd_q *cmdq)
  {
- 	return (join_pane(self, cmdq, self->entry == &cmd_join_pane_entry));
- }
- 
- enum cmd_retval
- join_pane(struct cmd *self, struct cmd_q *cmdq, int not_same_window)
- {
  	struct args		*args = self->args;
  	struct session		*dst_s;
  	struct winlink		*src_wl, *dst_wl;
--- 59,67 ----
  	.exec = cmd_join_pane_exec
  };
  
! static enum cmd_retval
  cmd_join_pane_exec(struct cmd *self, struct cmd_q *cmdq)
  {
  	struct args		*args = self->args;
  	struct session		*dst_s;
  	struct winlink		*src_wl, *dst_wl;
***************
*** 79,84 ****
--- 71,82 ----
  	int			 size, percentage, dst_idx;
  	enum layout_type	 type;
  	struct layout_cell	*lc;
+ 	int			 not_same_window;
+ 
+ 	if (self->entry == &cmd_join_pane_entry)
+ 		not_same_window = 1;
+ 	else
+ 		not_same_window = 0;
  
  	dst_s = cmdq->state.tflag.s;
  	dst_wl = cmdq->state.tflag.wl;