===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty.c,v
retrieving revision 1.292
retrieving revision 1.293
diff -c -r1.292 -r1.293
*** src/usr.bin/tmux/tty.c	2017/07/21 22:55:45	1.292
--- src/usr.bin/tmux/tty.c	2017/08/21 21:01:21	1.293
***************
*** 1,4 ****
! /* $OpenBSD: tty.c,v 1.292 2017/07/21 22:55:45 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tty.c,v 1.293 2017/08/21 21:01:21 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 1609,1615 ****
  	}
  
  	/* Zero on the next line. */
! 	if (cx == 0 && cy == thisy + 1 && thisy != tty->rlower) {
  		tty_putc(tty, '\r');
  		tty_putc(tty, '\n');
  		goto out;
--- 1609,1616 ----
  	}
  
  	/* Zero on the next line. */
! 	if (cx == 0 && cy == thisy + 1 && thisy != tty->rlower &&
! 	    (!tty_use_margin(tty) || tty->rleft == 0)) {
  		tty_putc(tty, '\r');
  		tty_putc(tty, '\n');
  		goto out;