===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty.c,v
retrieving revision 1.217
retrieving revision 1.218
diff -c -r1.217 -r1.218
*** src/usr.bin/tmux/tty.c	2016/11/30 13:20:02	1.217
--- src/usr.bin/tmux/tty.c	2016/12/07 09:16:55	1.218
***************
*** 1,4 ****
! /* $OpenBSD: tty.c,v 1.217 2016/11/30 13:20:02 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tty.c,v 1.218 2016/12/07 09:16:55 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 1153,1159 ****
  				tty_cursor_pane(tty, ctx, 0, ctx->ocy + 1);
  			else
  				tty_cursor_pane(tty, ctx, 0, ctx->ocy);
! 		} else if (tty->cx != tty->sx - 1) {
  			/*
  			 * The cursor isn't in the last position already, so
  			 * move as far right as possible and redraw the last
--- 1153,1160 ----
  				tty_cursor_pane(tty, ctx, 0, ctx->ocy + 1);
  			else
  				tty_cursor_pane(tty, ctx, 0, ctx->ocy);
! 		} else if (tty->cy != ctx->yoff + ctx->ocy ||
! 		    tty->cx < tty->sx) {
  			/*
  			 * The cursor isn't in the last position already, so
  			 * move as far right as possible and redraw the last