===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-queue.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -c -r1.97 -r1.98
*** src/usr.bin/tmux/cmd-queue.c	2020/05/16 16:35:13	1.97
--- src/usr.bin/tmux/cmd-queue.c	2020/06/01 09:43:01	1.98
***************
*** 1,4 ****
! /* $OpenBSD: cmd-queue.c,v 1.97 2020/05/16 16:35:13 nicm Exp $ */
  
  /*
   * Copyright (c) 2013 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-queue.c,v 1.98 2020/06/01 09:43:01 nicm Exp $ */
  
  /*
   * Copyright (c) 2013 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 780,786 ****
  	u_int		 number = item->number;
  
  	if (c != NULL && (c->flags & CLIENT_CONTROL))
! 		file_print(c, "%%%s %ld %u %d\n", guard, t, number, flags);
  }
  
  /* Show message from command. */
--- 780,786 ----
  	u_int		 number = item->number;
  
  	if (c != NULL && (c->flags & CLIENT_CONTROL))
! 		control_write(c, "%%%s %ld %u %d", guard, t, number, flags);
  }
  
  /* Show message from command. */
***************
*** 807,813 ****
  			msg = utf8_sanitize(tmp);
  			free(tmp);
  		}
! 		file_print(c, "%s\n", msg);
  	} else {
  		wp = server_client_get_pane(c);
  		wme = TAILQ_FIRST(&wp->modes);
--- 807,816 ----
  			msg = utf8_sanitize(tmp);
  			free(tmp);
  		}
! 		if (c->flags & CLIENT_CONTROL)
! 			control_write(c, "%s", msg);
! 		else
! 			file_print(c, "%s\n", msg);
  	} else {
  		wp = server_client_get_pane(c);
  		wme = TAILQ_FIRST(&wp->modes);
***************
*** 849,855 ****
  			free(tmp);
  		}
  		if (c->flags & CLIENT_CONTROL)
! 			file_print(c, "%s\n", msg);
  		else
  			file_error(c, "%s\n", msg);
  		c->retval = 1;
--- 852,858 ----
  			free(tmp);
  		}
  		if (c->flags & CLIENT_CONTROL)
! 			control_write(c, "%s", msg);
  		else
  			file_error(c, "%s\n", msg);
  		c->retval = 1;