===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/popup.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -c -r1.34 -r1.35
*** src/usr.bin/tmux/popup.c	2021/08/17 08:22:44	1.34
--- src/usr.bin/tmux/popup.c	2021/10/11 10:55:30	1.35
***************
*** 1,4 ****
! /* $OpenBSD: popup.c,v 1.34 2021/08/17 08:22:44 nicm Exp $ */
  
  /*
   * Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: popup.c,v 1.35 2021/10/11 10:55:30 nicm Exp $ */
  
  /*
   * Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 590,597 ****
  
  int
  popup_display(int flags, struct cmdq_item *item, u_int px, u_int py, u_int sx,
!     u_int sy, const char *shellcmd, int argc, char **argv, const char *cwd,
!     struct client *c, struct session *s, popup_close_cb cb, void *arg)
  {
  	struct popup_data	*pd;
  	u_int			 jx, jy;
--- 590,598 ----
  
  int
  popup_display(int flags, struct cmdq_item *item, u_int px, u_int py, u_int sx,
!     u_int sy, struct environ *env, const char *shellcmd, int argc, char **argv,
!     const char *cwd, struct client *c, struct session *s, popup_close_cb cb,
!     void *arg)
  {
  	struct popup_data	*pd;
  	u_int			 jx, jy;
***************
*** 635,641 ****
  	pd->psx = sx;
  	pd->psy = sy;
  
! 	pd->job = job_run(shellcmd, argc, argv, s, cwd,
  	    popup_job_update_cb, popup_job_complete_cb, NULL, pd,
  	    JOB_NOWAIT|JOB_PTY|JOB_KEEPWRITE, jx, jy);
  	pd->ictx = input_init(NULL, job_get_event(pd->job), &pd->palette);
--- 636,642 ----
  	pd->psx = sx;
  	pd->psy = sy;
  
! 	pd->job = job_run(shellcmd, argc, argv, env, s, cwd,
  	    popup_job_update_cb, popup_job_complete_cb, NULL, pd,
  	    JOB_NOWAIT|JOB_PTY|JOB_KEEPWRITE, jx, jy);
  	pd->ictx = input_init(NULL, job_get_event(pd->job), &pd->palette);
***************
*** 725,731 ****
  
  	xasprintf(&cmd, "%s %s", editor, path);
  	if (popup_display(POPUP_INTERNAL|POPUP_CLOSEEXIT, NULL, px, py, sx, sy,
! 	    cmd, 0, NULL, _PATH_TMP, c, NULL, popup_editor_close_cb, pe) != 0) {
  		popup_editor_free(pe);
  		free(cmd);
  		return (-1);
--- 726,732 ----
  
  	xasprintf(&cmd, "%s %s", editor, path);
  	if (popup_display(POPUP_INTERNAL|POPUP_CLOSEEXIT, NULL, px, py, sx, sy,
! 	    NULL, cmd, 0, NULL, _PATH_TMP, c, NULL, popup_editor_close_cb, pe) != 0) {
  		popup_editor_free(pe);
  		free(cmd);
  		return (-1);