===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-join-pane.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -c -r1.36 -r1.37
*** src/usr.bin/tmux/cmd-join-pane.c	2019/10/15 08:25:37	1.36
--- src/usr.bin/tmux/cmd-join-pane.c	2019/11/18 09:43:31	1.37
***************
*** 1,4 ****
! /* $OpenBSD: cmd-join-pane.c,v 1.36 2019/10/15 08:25:37 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 George Nachman <tmux@georgester.com>
--- 1,4 ----
! /* $OpenBSD: cmd-join-pane.c,v 1.37 2019/11/18 09:43:31 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 George Nachman <tmux@georgester.com>
***************
*** 36,43 ****
  	.name = "join-pane",
  	.alias = "joinp",
  
! 	.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 },
--- 36,43 ----
  	.name = "join-pane",
  	.alias = "joinp",
  
! 	.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 },
***************
*** 143,152 ****
  		else
  			size = (dst_wp->sx * percentage) / 100;
  	}
  	if (args_has(args, 'b'))
! 		flags = SPAWN_BEFORE;
! 	else
! 		flags = 0;
  	lc = layout_split_pane(dst_wp, type, size, flags);
  	if (lc == NULL) {
  		cmdq_error(item, "create pane failed: pane too small");
--- 143,155 ----
  		else
  			size = (dst_wp->sx * percentage) / 100;
  	}
+ 
+ 	flags = 0;
  	if (args_has(args, 'b'))
! 		flags |= SPAWN_BEFORE;
! 	if (args_has(args, 'f'))
! 		flags |= SPAWN_FULLSIZE;
! 
  	lc = layout_split_pane(dst_wp, type, size, flags);
  	if (lc == NULL) {
  		cmdq_error(item, "create pane failed: pane too small");