===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-queue.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** src/usr.bin/tmux/cmd-queue.c	2013/03/24 09:54:10	1.1
--- src/usr.bin/tmux/cmd-queue.c	2013/03/25 10:05:00	1.2
***************
*** 1,4 ****
! /* $OpenBSD: cmd-queue.c,v 1.1 2013/03/24 09:54:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2013 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-queue.c,v 1.2 2013/03/25 10:05:00 nicm Exp $ */
  
  /*
   * Copyright (c) 2013 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 207,214 ****
  			if (guards)
  				cmdq_print(cmdq, "%%begin");
  			retval = cmdq->cmd->entry->exec(cmdq->cmd, cmdq);
! 			if (guards)
! 				cmdq_print(cmdq, "%%end");
  
  			if (retval == CMD_RETURN_ERROR)
  				break;
--- 207,218 ----
  			if (guards)
  				cmdq_print(cmdq, "%%begin");
  			retval = cmdq->cmd->entry->exec(cmdq->cmd, cmdq);
! 			if (guards) {
! 				if (retval == CMD_RETURN_ERROR)
! 					cmdq_print(cmdq, "%%error");
! 				else
! 					cmdq_print(cmdq, "%%end");
! 			}
  
  			if (retval == CMD_RETURN_ERROR)
  				break;