=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/job.c,v retrieving revision 1.64 retrieving revision 1.65 diff -c -r1.64 -r1.65 *** src/usr.bin/tmux/job.c 2021/10/05 12:49:37 1.64 --- src/usr.bin/tmux/job.c 2021/10/11 10:55:30 1.65 *************** *** 1,4 **** ! /* $OpenBSD: job.c,v 1.64 2021/10/05 12:49:37 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott --- 1,4 ---- ! /* $OpenBSD: job.c,v 1.65 2021/10/11 10:55:30 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott *************** *** 71,77 **** /* Start a job running. */ struct job * ! job_run(const char *cmd, int argc, char **argv, struct session *s, const char *cwd, job_update_cb updatecb, job_complete_cb completecb, job_free_cb freecb, void *data, int flags, int sx, int sy) { --- 71,77 ---- /* Start a job running. */ struct job * ! job_run(const char *cmd, int argc, char **argv, struct environ *e, struct session *s, const char *cwd, job_update_cb updatecb, job_complete_cb completecb, job_free_cb freecb, void *data, int flags, int sx, int sy) { *************** *** 89,94 **** --- 89,97 ---- * if-shell to decide on default-terminal based on outside TERM. */ env = environ_for_session(s, !cfg_finished); + if (e != NULL) { + environ_copy(e, env); + } sigfillset(&set); sigprocmask(SIG_BLOCK, &set, &oldset);