===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty.c,v
retrieving revision 1.214
retrieving revision 1.215
diff -c -r1.214 -r1.215
*** src/usr.bin/tmux/tty.c	2016/11/15 15:17:28	1.214
--- src/usr.bin/tmux/tty.c	2016/11/16 13:31:22	1.215
***************
*** 1,4 ****
! /* $OpenBSD: tty.c,v 1.214 2016/11/15 15:17:28 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tty.c,v 1.215 2016/11/16 13:31:22 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 1004,1010 ****
  	 * off the edge - if so, move the cursor back to the right.
  	 */
  	if (ctx->xoff + ctx->ocx > tty->rright)
! 		tty_cursor(tty, tty->rright, ctx->yoff + ctx->ocy);
  	else
  		tty_cursor_pane(tty, ctx, ctx->ocx, ctx->ocy);
  
--- 1004,1010 ----
  	 * off the edge - if so, move the cursor back to the right.
  	 */
  	if (ctx->xoff + ctx->ocx > tty->rright)
! 		tty_cursor(tty, tty->rright, tty->rlower);
  	else
  		tty_cursor_pane(tty, ctx, ctx->ocx, ctx->ocy);
  
***************
*** 1134,1141 ****
  	struct screen		*s = wp->screen;
  	u_int			 cx, width;
  
! 	if (ctx->ocy == ctx->orlower)
  		tty_region_pane(tty, ctx, ctx->orupper, ctx->orlower);
  	tty_margin_off(tty);
  
  	/* Is the cursor in the very last position? */
--- 1134,1145 ----
  	struct screen		*s = wp->screen;
  	u_int			 cx, width;
  
! 	if (ctx->xoff + ctx->ocx > tty->sx - 1 &&
! 	    ctx->yoff + ctx->ocy == ctx->orlower &&
! 	    tty_pane_full_width(tty, ctx))
  		tty_region_pane(tty, ctx, ctx->orupper, ctx->orlower);
+ 	else
+ 		tty_region_off(tty);
  	tty_margin_off(tty);
  
  	/* Is the cursor in the very last position? */