===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-respawn-pane.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -c -r1.22 -r1.23
*** src/usr.bin/tmux/cmd-respawn-pane.c	2016/10/16 19:04:05	1.22
--- src/usr.bin/tmux/cmd-respawn-pane.c	2017/03/09 17:02:38	1.23
***************
*** 1,4 ****
! /* $OpenBSD: cmd-respawn-pane.c,v 1.22 2016/10/16 19:04:05 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-respawn-pane.c,v 1.23 2017/03/09 17:02:38 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 65,75 ****
  		return (CMD_RETURN_ERROR);
  	}
  
- 	env = environ_create();
- 	environ_copy(global_environ, env);
- 	environ_copy(s->environ, env);
- 	server_fill_environ(s, env);
- 
  	window_pane_reset_mode(wp);
  	screen_reinit(&wp->base);
  	input_init(wp);
--- 65,70 ----
***************
*** 82,87 ****
--- 77,83 ----
  	if (envent != NULL)
  		path = envent->value;
  
+ 	env = environ_for_session(s);
  	if (window_pane_spawn(wp, args->argc, args->argv, path, NULL, NULL, env,
  	    s->tio, &cause) != 0) {
  		cmdq_error(item, "respawn pane failed: %s", cause);
***************
*** 89,97 ****
  		environ_free(env);
  		return (CMD_RETURN_ERROR);
  	}
  	wp->flags |= PANE_REDRAW;
  	server_status_window(w);
  
- 	environ_free(env);
  	return (CMD_RETURN_NORMAL);
  }
--- 85,94 ----
  		environ_free(env);
  		return (CMD_RETURN_ERROR);
  	}
+ 	environ_free(env);
+ 
  	wp->flags |= PANE_REDRAW;
  	server_status_window(w);
  
  	return (CMD_RETURN_NORMAL);
  }