===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-set-environment.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -c -r1.15 -r1.16
*** src/usr.bin/tmux/cmd-set-environment.c	2015/12/14 00:31:54	1.15
--- src/usr.bin/tmux/cmd-set-environment.c	2015/12/16 21:47:00	1.16
***************
*** 1,4 ****
! /* $OpenBSD: cmd-set-environment.c,v 1.15 2015/12/14 00:31:54 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-set-environment.c,v 1.16 2015/12/16 21:47:00 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 36,42 ****
  	.args = { "grt:u", 1, 2 },
  	.usage = "[-gru] " CMD_TARGET_SESSION_USAGE " name [value]",
  
! 	.tflag = CMD_SESSION,
  
  	.flags = 0,
  	.exec = cmd_set_environment_exec
--- 36,42 ----
  	.args = { "grt:u", 1, 2 },
  	.usage = "[-gru] " CMD_TARGET_SESSION_USAGE " name [value]",
  
! 	.tflag = CMD_SESSION_CANFAIL,
  
  	.flags = 0,
  	.exec = cmd_set_environment_exec
***************
*** 64,70 ****
  	else
  		value = args->argv[1];
  
! 	if (args_has(self->args, 'g'))
  		env = global_environ;
  	else
  		env = cmdq->state.tflag.s->environ;
--- 64,70 ----
  	else
  		value = args->argv[1];
  
! 	if (args_has(self->args, 'g') || cmdq->state.tflag.s == NULL)
  		env = global_environ;
  	else
  		env = cmdq->state.tflag.s->environ;