===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/screen-write.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -c -r1.127 -r1.128
*** src/usr.bin/tmux/screen-write.c	2017/06/04 08:02:20	1.127
--- src/usr.bin/tmux/screen-write.c	2017/06/12 10:57:35	1.128
***************
*** 1,4 ****
! /* $OpenBSD: screen-write.c,v 1.127 2017/06/04 08:02:20 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: screen-write.c,v 1.128 2017/06/12 10:57:35 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 1339,1346 ****
--- 1339,1348 ----
  
  	/* Check this will fit on the current line and wrap if not. */
  	if ((s->mode & MODE_WRAP) && s->cx > sx - width) {
+ 		log_debug("%s: wrapped at %u,%u", __func__, s->cx, s->cy);
  		screen_write_linefeed(ctx, 1, 8);
  		s->cx = 0;
+ 		screen_write_collect_flush(ctx, 1);
  	}
  
  	/* Sanity check cursor position. */