===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-join-pane.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -c -r1.43 -r1.44
*** src/usr.bin/tmux/cmd-join-pane.c	2020/04/13 14:46:04	1.43
--- src/usr.bin/tmux/cmd-join-pane.c	2020/04/22 21:15:33	1.44
***************
*** 1,4 ****
! /* $OpenBSD: cmd-join-pane.c,v 1.43 2020/04/13 14:46:04 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 George Nachman <tmux@georgester.com>
--- 1,4 ----
! /* $OpenBSD: cmd-join-pane.c,v 1.44 2020/04/22 21:15:33 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 George Nachman <tmux@georgester.com>
***************
*** 50,57 ****
  	.name = "move-pane",
  	.alias = "movep",
  
! 	.args = { "bdhvp:l:s:t:", 0, 0 },
! 	.usage = "[-bdhv] [-l size] " CMD_SRCDST_PANE_USAGE,
  
  	.source = { 's', CMD_FIND_PANE, CMD_FIND_DEFAULT_MARKED },
  	.target = { 't', CMD_FIND_PANE, 0 },
--- 50,57 ----
  	.name = "move-pane",
  	.alias = "movep",
  
! 	.args = { "bdfhvp:l:s:t:", 0, 0 },
! 	.usage = "[-bdfhv] [-l size] " CMD_SRCDST_PANE_USAGE,
  
  	.source = { 's', CMD_FIND_PANE, CMD_FIND_DEFAULT_MARKED },
  	.target = { 't', CMD_FIND_PANE, 0 },
***************
*** 72,87 ****
  	struct window		*src_w, *dst_w;
  	struct window_pane	*src_wp, *dst_wp;
  	char			*cause = NULL;
! 	int			 size, percentage, dst_idx, not_same_window;
  	int			 flags;
  	enum layout_type	 type;
  	struct layout_cell	*lc;
  
- 	if (cmd_get_entry(self) == &cmd_join_pane_entry)
- 		not_same_window = 1;
- 	else
- 		not_same_window = 0;
- 
  	dst_s = target->s;
  	dst_wl = target->wl;
  	dst_wp = target->wp;
--- 72,82 ----
  	struct window		*src_w, *dst_w;
  	struct window_pane	*src_wp, *dst_wp;
  	char			*cause = NULL;
! 	int			 size, percentage, dst_idx;
  	int			 flags;
  	enum layout_type	 type;
  	struct layout_cell	*lc;
  
  	dst_s = target->s;
  	dst_wl = target->wl;
  	dst_wp = target->wp;
***************
*** 94,104 ****
  	src_w = src_wl->window;
  	server_unzoom_window(src_w);
  
! 	if (not_same_window && src_w == dst_w) {
! 		cmdq_error(item, "can't join a pane to its own window");
! 		return (CMD_RETURN_ERROR);
! 	}
! 	if (!not_same_window && src_wp == dst_wp) {
  		cmdq_error(item, "source and target panes must be different");
  		return (CMD_RETURN_ERROR);
  	}
--- 89,95 ----
  	src_w = src_wl->window;
  	server_unzoom_window(src_w);
  
! 	if (src_wp == dst_wp) {
  		cmdq_error(item, "source and target panes must be different");
  		return (CMD_RETURN_ERROR);
  	}