===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cfg.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/tmux/cfg.c	2009/08/23 16:45:00	1.5
--- src/usr.bin/tmux/cfg.c	2009/08/23 17:29:51	1.6
***************
*** 1,4 ****
! /* $OpenBSD: cfg.c,v 1.5 2009/08/23 16:45:00 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cfg.c,v 1.6 2009/08/23 17:29:51 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 51,57 ****
  }
  
  int
! load_cfg(const char *path, char **cause)
  {
  	FILE   	        *f;
  	u_int		 n;
--- 51,57 ----
  }
  
  int
! load_cfg(const char *path, struct cmd_ctx *ctxin, char **cause)
  {
  	FILE   	        *f;
  	u_int		 n;
***************
*** 87,100 ****
  			continue;
  		cfg_cause = NULL;
  
! 		ctx.msgdata = NULL;
! 		ctx.curclient = NULL;
  
  		ctx.error = cfg_error;
  		ctx.print = cfg_print;
  		ctx.info = cfg_print;
- 
- 		ctx.cmdclient = NULL;
  
  		cfg_cause = NULL;
  		cmd_list_exec(cmdlist, &ctx);
--- 87,105 ----
  			continue;
  		cfg_cause = NULL;
  
! 		if (ctxin == NULL) {
! 			ctx.msgdata = NULL;
! 			ctx.curclient = NULL;
! 			ctx.cmdclient = NULL;
! 		} else {
! 			ctx.msgdata = ctxin->msgdata;
! 			ctx.curclient = ctxin->curclient;
! 			ctx.cmdclient = ctxin->cmdclient;
! 		}
  
  		ctx.error = cfg_error;
  		ctx.print = cfg_print;
  		ctx.info = cfg_print;
  
  		cfg_cause = NULL;
  		cmd_list_exec(cmdlist, &ctx);