===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty.c,v
retrieving revision 1.232
retrieving revision 1.233
diff -c -r1.232 -r1.233
*** src/usr.bin/tmux/tty.c	2017/02/07 18:27:46	1.232
--- src/usr.bin/tmux/tty.c	2017/02/08 08:50:10	1.233
***************
*** 1,4 ****
! /* $OpenBSD: tty.c,v 1.232 2017/02/07 18:27:46 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tty.c,v 1.233 2017/02/08 08:50:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 998,1014 ****
  		return;
  	}
  
- 	/*
- 	 * If this line wrapped naturally (ctx->num is nonzero) and we are not
- 	 * using margins, don't do anything - the cursor can just be moved
- 	 * to the last cell and wrap naturally.
- 	 */
- 	if ((!tty_use_margin(tty) ||
- 	    tty_pane_full_width(tty, ctx)) &&
- 	    ctx->num != 0 &&
- 	    !(tty->term->flags & TERM_EARLYWRAP))
- 		return;
- 
  	tty_attributes(tty, &grid_default_cell, wp);
  
  	tty_region_pane(tty, ctx, ctx->orupper, ctx->orlower);
--- 998,1003 ----
***************
*** 1164,1171 ****
  tty_cmd_cell(struct tty *tty, const struct tty_ctx *ctx)
  {
  	struct window_pane	*wp = ctx->wp;
- 	struct screen		*s = wp->screen;
- 	u_int			 cx, width;
  
  	if (ctx->xoff + ctx->ocx > tty->sx - 1 && ctx->ocy == ctx->orlower) {
  		if (tty_pane_full_width(tty, ctx))
--- 1153,1158 ----
***************
*** 1174,1204 ****
  			tty_margin_off(tty);
  	}
  
! 	/* Is the cursor in the very last position? */
! 	width = ctx->cell->data.width;
! 	if (ctx->ocx > wp->sx - width) {
! 		if (!tty_pane_full_width(tty, ctx)) {
! 			/*
! 			 * The pane doesn't fill the entire line, the linefeed
! 			 * will already have happened, so just move the cursor.
! 			 */
! 			if (ctx->ocy != wp->yoff + wp->screen->rlower)
! 				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
! 			 * cell to move into the last position.
! 			 */
! 			cx = screen_size_x(s) - ctx->last_cell.data.width;
! 			tty_cursor_pane(tty, ctx, cx, ctx->ocy);
! 			tty_cell(tty, &ctx->last_cell, wp);
! 		}
! 	} else
! 		tty_cursor_pane(tty, ctx, ctx->ocx, ctx->ocy);
  
  	tty_cell(tty, ctx->cell, wp);
  }
--- 1161,1167 ----
  			tty_margin_off(tty);
  	}
  
! 	tty_cursor_pane(tty, ctx, ctx->ocx, ctx->ocy);
  
  	tty_cell(tty, ctx->cell, wp);
  }