===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-pipe-pane.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -c -r1.52 -r1.53
*** src/usr.bin/tmux/cmd-pipe-pane.c	2020/04/13 08:26:27	1.52
--- src/usr.bin/tmux/cmd-pipe-pane.c	2020/04/13 10:59:58	1.53
***************
*** 1,4 ****
! /* $OpenBSD: cmd-pipe-pane.c,v 1.52 2020/04/13 08:26:27 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-pipe-pane.c,v 1.53 2020/04/13 10:59:58 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 57,66 ****
  cmd_pipe_pane_exec(struct cmd *self, struct cmdq_item *item)
  {
  	struct args		*args = cmd_get_args(self);
  	struct client		*c = cmd_find_client(item, NULL, 1);
! 	struct window_pane	*wp = item->target.wp;
! 	struct session		*s = item->target.s;
! 	struct winlink		*wl = item->target.wl;
  	char			*cmd;
  	int			 old_fd, pipe_fd[2], null_fd, in, out;
  	struct format_tree	*ft;
--- 57,67 ----
  cmd_pipe_pane_exec(struct cmd *self, struct cmdq_item *item)
  {
  	struct args		*args = cmd_get_args(self);
+ 	struct cmd_find_state	*target = cmdq_get_target(item);
  	struct client		*c = cmd_find_client(item, NULL, 1);
! 	struct window_pane	*wp = target->wp;
! 	struct session		*s = target->s;
! 	struct winlink		*wl = target->wl;
  	char			*cmd;
  	int			 old_fd, pipe_fd[2], null_fd, in, out;
  	struct format_tree	*ft;
***************
*** 108,114 ****
  	}
  
  	/* Expand the command. */
! 	ft = format_create(item->client, item, FORMAT_NONE, 0);
  	format_defaults(ft, c, s, wl, wp);
  	cmd = format_expand_time(ft, args->argv[0]);
  	format_free(ft);
--- 109,115 ----
  	}
  
  	/* Expand the command. */
! 	ft = format_create(cmdq_get_client(item), item, FORMAT_NONE, 0);
  	format_defaults(ft, c, s, wl, wp);
  	cmd = format_expand_time(ft, args->argv[0]);
  	format_free(ft);