===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-show-environment.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -c -r1.16 -r1.17
*** src/usr.bin/tmux/cmd-show-environment.c	2015/12/14 00:31:54	1.16
--- src/usr.bin/tmux/cmd-show-environment.c	2015/12/16 21:47:00	1.17
***************
*** 1,4 ****
! /* $OpenBSD: cmd-show-environment.c,v 1.16 2015/12/14 00:31:54 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-show-environment.c,v 1.17 2015/12/16 21:47:00 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 94,100 ****
  	struct environ		*env;
  	struct environ_entry	*envent;
  
! 	if (args_has(self->args, 'g'))
  		env = global_environ;
  	else
  		env = cmdq->state.tflag.s->environ;
--- 94,100 ----
  	struct environ		*env;
  	struct environ_entry	*envent;
  
! 	if (args_has(self->args, 'g') || cmdq->state.tflag.s == NULL)
  		env = global_environ;
  	else
  		env = cmdq->state.tflag.s->environ;