===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/session.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -c -r1.73 -r1.74
*** src/usr.bin/tmux/session.c	2017/03/09 17:02:38	1.73
--- src/usr.bin/tmux/session.c	2017/04/25 15:35:10	1.74
***************
*** 1,4 ****
! /* $OpenBSD: session.c,v 1.73 2017/03/09 17:02:38 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: session.c,v 1.74 2017/04/25 15:35:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 360,366 ****
  		shell = _PATH_BSHELL;
  
  	hlimit = options_get_number(s->options, "history-limit");
! 	env = environ_for_session(s);
  	w = window_create_spawn(name, argc, argv, path, shell, cwd, env, s->tio,
  	    s->sx, s->sy, hlimit, cause);
  	if (w == NULL) {
--- 360,366 ----
  		shell = _PATH_BSHELL;
  
  	hlimit = options_get_number(s->options, "history-limit");
! 	env = environ_for_session(s, 0);
  	w = window_create_spawn(name, argc, argv, path, shell, cwd, env, s->tio,
  	    s->sx, s->sy, hlimit, cause);
  	if (w == NULL) {