===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-queue.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -c -r1.59 -r1.60
*** src/usr.bin/tmux/cmd-queue.c	2019/03/07 19:34:22	1.59
--- src/usr.bin/tmux/cmd-queue.c	2019/03/08 10:34:20	1.60
***************
*** 1,4 ****
! /* $OpenBSD: cmd-queue.c,v 1.59 2019/03/07 19:34:22 nicm Exp $ */
  
  /*
   * Copyright (c) 2013 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-queue.c,v 1.60 2019/03/08 10:34:20 nicm Exp $ */
  
  /*
   * Copyright (c) 2013 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 404,413 ****
  void
  cmdq_print(struct cmdq_item *item, const char *fmt, ...)
  {
! 	struct client	*c = item->client;
! 	struct window	*w;
! 	va_list		 ap;
! 	char		*tmp, *msg;
  
  	va_start(ap, fmt);
  
--- 404,413 ----
  void
  cmdq_print(struct cmdq_item *item, const char *fmt, ...)
  {
! 	struct client		*c = item->client;
! 	struct window_pane	*wp;
! 	va_list			 ap;
! 	char			*tmp, *msg;
  
  	va_start(ap, fmt);
  
***************
*** 425,433 ****
  		evbuffer_add(c->stdout_data, "\n", 1);
  		server_client_push_stdout(c);
  	} else {
! 		w = c->session->curw->window;
! 		window_copy_init_for_output(w->active);
! 		window_copy_vadd(w->active, fmt, ap);
  	}
  
  	va_end(ap);
--- 425,436 ----
  		evbuffer_add(c->stdout_data, "\n", 1);
  		server_client_push_stdout(c);
  	} else {
! 		wp = c->session->curw->window->active;
! 		if (wp->mode == NULL || wp->mode->mode != &window_view_mode) {
! 			window_pane_reset_mode(wp);
! 			window_pane_set_mode(wp, &window_view_mode, NULL, NULL);
! 		}
! 		window_copy_vadd(wp, fmt, ap);
  	}
  
  	va_end(ap);