===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cfg.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -c -r1.15 -r1.16
*** src/usr.bin/tmux/cfg.c	2012/07/10 11:53:01	1.15
--- src/usr.bin/tmux/cfg.c	2012/07/11 07:10:15	1.16
***************
*** 1,4 ****
! /* $OpenBSD: cfg.c,v 1.15 2012/07/10 11:53:01 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cfg.c,v 1.16 2012/07/11 07:10:15 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 81,87 ****
  	size_t		 len;
  	struct cmd_list	*cmdlist;
  	struct cmd_ctx	 ctx;
! 	int		 retval;
  
  	if ((f = fopen(path, "rb")) == NULL) {
  		cfg_add_cause(causes, "%s: %s", path, strerror(errno));
--- 81,87 ----
  	size_t		 len;
  	struct cmd_list	*cmdlist;
  	struct cmd_ctx	 ctx;
! 	enum cmd_retval	 retval;
  
  	if ((f = fopen(path, "rb")) == NULL) {
  		cfg_add_cause(causes, "%s: %s", path, strerror(errno));
***************
*** 90,96 ****
  	n = 0;
  
  	line = NULL;
! 	retval = 0;
  	while ((buf = fgetln(f, &len))) {
  		if (buf[len - 1] == '\n')
  			len--;
--- 90,96 ----
  	n = 0;
  
  	line = NULL;
! 	retval = CMD_RETURN_NORMAL;
  	while ((buf = fgetln(f, &len))) {
  		if (buf[len - 1] == '\n')
  			len--;
***************
*** 145,152 ****
  		ctx.info = cfg_print;
  
  		cfg_cause = NULL;
! 		if (cmd_list_exec(cmdlist, &ctx) == 1)
! 			retval = 1;
  		cmd_list_free(cmdlist);
  		if (cfg_cause != NULL) {
  			cfg_add_cause(
--- 145,162 ----
  		ctx.info = cfg_print;
  
  		cfg_cause = NULL;
! 		switch (cmd_list_exec(cmdlist, &ctx)) {
! 		case CMD_RETURN_YIELD:
! 			if (retval != CMD_RETURN_ATTACH)
! 				retval = CMD_RETURN_YIELD;
! 			break;
! 		case CMD_RETURN_ATTACH:
! 			retval = CMD_RETURN_ATTACH;
! 			break;
! 		case CMD_RETURN_ERROR:
! 		case CMD_RETURN_NORMAL:
! 			break;
! 		}
  		cmd_list_free(cmdlist);
  		if (cfg_cause != NULL) {
  			cfg_add_cause(