===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/format.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -c -r1.90 -r1.91
*** src/usr.bin/tmux/format.c	2015/10/27 15:58:42	1.90
--- src/usr.bin/tmux/format.c	2015/10/28 09:51:55	1.91
***************
*** 1,4 ****
! /* $OpenBSD: format.c,v 1.90 2015/10/27 15:58:42 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: format.c,v 1.91 2015/10/28 09:51:55 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 631,639 ****
  	if (~modifiers & FORMAT_TIMESTRING) {
  		envent = NULL;
  		if (ft->s != NULL)
! 			envent = environ_find(&ft->s->environ, key);
  		if (envent == NULL)
! 			envent = environ_find(&global_environ, key);
  		if (envent != NULL) {
  			found = envent->value;
  			goto found;
--- 631,639 ----
  	if (~modifiers & FORMAT_TIMESTRING) {
  		envent = NULL;
  		if (ft->s != NULL)
! 			envent = environ_find(ft->s->environ, key);
  		if (envent == NULL)
! 			envent = environ_find(global_environ, key);
  		if (envent != NULL) {
  			found = envent->value;
  			goto found;