===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-queue.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/tmux/cmd-queue.c	2013/06/23 12:41:54	1.9
--- src/usr.bin/tmux/cmd-queue.c	2013/10/10 11:45:28	1.10
***************
*** 1,4 ****
! /* $OpenBSD: cmd-queue.c,v 1.9 2013/06/23 12:41:54 nicm Exp $ */
  
  /*
   * Copyright (c) 2013 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-queue.c,v 1.10 2013/10/10 11:45:28 nicm Exp $ */
  
  /*
   * Copyright (c) 2013 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 154,171 ****
  
  /* Print a guard line. */
  int
! cmdq_guard(struct cmd_q *cmdq, const char *guard)
  {
  	struct client	*c = cmdq->client;
- 	int		 flags;
  
  	if (c == NULL)
  		return 0;
  	if (!(c->flags & CLIENT_CONTROL))
  		return 0;
  
- 	flags = !!(cmdq->cmd->flags & CMD_CONTROL);
- 
  	evbuffer_add_printf(c->stdout_data, "%%%s %ld %u %d\n", guard,
  	    (long) cmdq->time, cmdq->number, flags);
  	server_push_stdout(c);
--- 154,168 ----
  
  /* Print a guard line. */
  int
! cmdq_guard(struct cmd_q *cmdq, const char *guard, int flags)
  {
  	struct client	*c = cmdq->client;
  
  	if (c == NULL)
  		return 0;
  	if (!(c->flags & CLIENT_CONTROL))
  		return 0;
  
  	evbuffer_add_printf(c->stdout_data, "%%%s %ld %u %d\n", guard,
  	    (long) cmdq->time, cmdq->number, flags);
  	server_push_stdout(c);
***************
*** 202,208 ****
  {
  	struct cmd_q_item	*next;
  	enum cmd_retval		 retval;
! 	int			 empty, guard;
  	char			 s[1024];
  
  	notify_disable();
--- 199,205 ----
  {
  	struct cmd_q_item	*next;
  	enum cmd_retval		 retval;
! 	int			 empty, guard, flags;
  	char			 s[1024];
  
  	notify_disable();
***************
*** 228,240 ****
  			cmdq->time = time(NULL);
  			cmdq->number++;
  
! 			guard = cmdq_guard(cmdq, "begin");
  			retval = cmdq->cmd->entry->exec(cmdq->cmd, cmdq);
  			if (guard) {
  				if (retval == CMD_RETURN_ERROR)
! 				    cmdq_guard(cmdq, "error");
  				else
! 				    cmdq_guard(cmdq, "end");
  			}
  
  			if (retval == CMD_RETURN_ERROR)
--- 225,240 ----
  			cmdq->time = time(NULL);
  			cmdq->number++;
  
! 			flags = !!(cmdq->cmd->flags & CMD_CONTROL);
! 			guard = cmdq_guard(cmdq, "begin", flags);
! 
  			retval = cmdq->cmd->entry->exec(cmdq->cmd, cmdq);
+ 
  			if (guard) {
  				if (retval == CMD_RETURN_ERROR)
! 					cmdq_guard(cmdq, "error", flags);
  				else
! 					cmdq_guard(cmdq, "end", flags);
  			}
  
  			if (retval == CMD_RETURN_ERROR)