===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-join-pane.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -c -r1.39 -r1.40
*** src/usr.bin/tmux/cmd-join-pane.c	2020/03/21 13:16:15	1.39
--- src/usr.bin/tmux/cmd-join-pane.c	2020/04/13 08:26:27	1.40
***************
*** 1,4 ****
! /* $OpenBSD: cmd-join-pane.c,v 1.39 2020/03/21 13:16:15 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 George Nachman <tmux@georgester.com>
--- 1,4 ----
! /* $OpenBSD: cmd-join-pane.c,v 1.40 2020/04/13 08:26:27 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 George Nachman <tmux@georgester.com>
***************
*** 63,69 ****
  static enum cmd_retval
  cmd_join_pane_exec(struct cmd *self, struct cmdq_item *item)
  {
! 	struct args		*args = self->args;
  	struct cmd_find_state	*current = &item->shared->current;
  	struct session		*dst_s;
  	struct winlink		*src_wl, *dst_wl;
--- 63,69 ----
  static enum cmd_retval
  cmd_join_pane_exec(struct cmd *self, struct cmdq_item *item)
  {
! 	struct args		*args = cmd_get_args(self);
  	struct cmd_find_state	*current = &item->shared->current;
  	struct session		*dst_s;
  	struct winlink		*src_wl, *dst_wl;
***************
*** 75,81 ****
  	enum layout_type	 type;
  	struct layout_cell	*lc;
  
! 	if (self->entry == &cmd_join_pane_entry)
  		not_same_window = 1;
  	else
  		not_same_window = 0;
--- 75,81 ----
  	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;