===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-break-pane.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -c -r1.54 -r1.55
*** src/usr.bin/tmux/cmd-break-pane.c	2020/04/13 14:46:04	1.54
--- src/usr.bin/tmux/cmd-break-pane.c	2020/04/13 20:51:57	1.55
***************
*** 1,4 ****
! /* $OpenBSD: cmd-break-pane.c,v 1.54 2020/04/13 14:46:04 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-break-pane.c,v 1.55 2020/04/13 20:51:57 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 52,58 ****
  	struct cmd_find_state	*current = cmdq_get_current(item);
  	struct cmd_find_state	*target = cmdq_get_target(item);
  	struct cmd_find_state	*source = cmdq_get_source(item);
! 	struct client		*c = cmd_find_client(item, NULL, 1);
  	struct winlink		*wl = source->wl;
  	struct session		*src_s = source->s;
  	struct session		*dst_s = target->s;
--- 52,58 ----
  	struct cmd_find_state	*current = cmdq_get_current(item);
  	struct cmd_find_state	*target = cmdq_get_target(item);
  	struct cmd_find_state	*source = cmdq_get_source(item);
! 	struct client		*tc = cmdq_get_target_client(item);
  	struct winlink		*wl = source->wl;
  	struct session		*src_s = source->s;
  	struct session		*dst_s = target->s;
***************
*** 83,89 ****
  	wp->flags |= PANE_STYLECHANGED;
  	TAILQ_INSERT_HEAD(&w->panes, wp, entry);
  	w->active = wp;
! 	w->latest = c;
  
  	if (!args_has(args, 'n')) {
  		name = default_window_name(w);
--- 83,89 ----
  	wp->flags |= PANE_STYLECHANGED;
  	TAILQ_INSERT_HEAD(&w->panes, wp, entry);
  	w->active = wp;
! 	w->latest = tc;
  
  	if (!args_has(args, 'n')) {
  		name = default_window_name(w);
***************
*** 115,121 ****
  	if (args_has(args, 'P')) {
  		if ((template = args_get(args, 'F')) == NULL)
  			template = BREAK_PANE_TEMPLATE;
! 		cp = format_single(item, template, c, dst_s, wl, wp);
  		cmdq_print(item, "%s", cp);
  		free(cp);
  	}
--- 115,121 ----
  	if (args_has(args, 'P')) {
  		if ((template = args_get(args, 'F')) == NULL)
  			template = BREAK_PANE_TEMPLATE;
! 		cp = format_single(item, template, tc, dst_s, wl, wp);
  		cmdq_print(item, "%s", cp);
  		free(cp);
  	}