===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-if-shell.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -c -r1.62 -r1.63
*** src/usr.bin/tmux/cmd-if-shell.c	2019/05/25 07:15:53	1.62
--- src/usr.bin/tmux/cmd-if-shell.c	2019/06/12 08:47:07	1.63
***************
*** 1,4 ****
! /* $OpenBSD: cmd-if-shell.c,v 1.62 2019/05/25 07:15:53 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
--- 1,4 ----
! /* $OpenBSD: cmd-if-shell.c,v 1.63 2019/06/12 08:47:07 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
***************
*** 67,76 ****
  	struct cmd_if_shell_data	*cdata;
  	char				*shellcmd, *cmd;
  	struct cmdq_item		*new_item;
  	struct client			*c = cmd_find_client(item, NULL, 1);
! 	struct session			*s = item->target.s;
! 	struct winlink			*wl = item->target.wl;
! 	struct window_pane		*wp = item->target.wp;
  	struct cmd_parse_input		 pi;
  	struct cmd_parse_result		*pr;
  
--- 67,77 ----
  	struct cmd_if_shell_data	*cdata;
  	char				*shellcmd, *cmd;
  	struct cmdq_item		*new_item;
+ 	struct cmd_find_state		*fs = &item->target;
  	struct client			*c = cmd_find_client(item, NULL, 1);
! 	struct session			*s = fs->s;
! 	struct winlink			*wl = fs->wl;
! 	struct window_pane		*wp = fs->wp;
  	struct cmd_parse_input		 pi;
  	struct cmd_parse_result		*pr;
  
***************
*** 92,98 ****
  		pi.line = self->line;
  		pi.item = item;
  		pi.c = c;
! 		cmd_find_copy_state(&pi.fs, &item->target);
  
  		pr = cmd_parse_from_string(cmd, &pi);
  		switch (pr->status) {
--- 93,99 ----
  		pi.line = self->line;
  		pi.item = item;
  		pi.c = c;
! 		cmd_find_copy_state(&pi.fs, fs);
  
  		pr = cmd_parse_from_string(cmd, &pi);
  		switch (pr->status) {
***************
*** 103,109 ****
  			free(pr->error);
  			return (CMD_RETURN_ERROR);
  		case CMD_PARSE_SUCCESS:
! 			new_item = cmdq_get_command(pr->cmdlist, NULL, m, 0);
  			cmdq_insert_after(item, new_item);
  			cmd_list_free(pr->cmdlist);
  			break;
--- 104,110 ----
  			free(pr->error);
  			return (CMD_RETURN_ERROR);
  		case CMD_PARSE_SUCCESS:
! 			new_item = cmdq_get_command(pr->cmdlist, fs, m, 0);
  			cmdq_insert_after(item, new_item);
  			cmd_list_free(pr->cmdlist);
  			break;
***************
*** 137,143 ****
  	cdata->input.c = c;
  	if (cdata->input.c != NULL)
  		cdata->input.c->references++;
! 	cmd_find_copy_state(&cdata->input.fs, &item->target);
  
  	if (job_run(shellcmd, s, server_client_get_cwd(item->client, s), NULL,
  	    cmd_if_shell_callback, cmd_if_shell_free, cdata, 0) == NULL) {
--- 138,144 ----
  	cdata->input.c = c;
  	if (cdata->input.c != NULL)
  		cdata->input.c->references++;
! 	cmd_find_copy_state(&cdata->input.fs, fs);
  
  	if (job_run(shellcmd, s, server_client_get_cwd(item->client, s), NULL,
  	    cmd_if_shell_callback, cmd_if_shell_free, cdata, 0) == NULL) {