===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -c -r1.56 -r1.57
*** src/usr.bin/tmux/tty.c	2009/10/21 13:42:44	1.56
--- src/usr.bin/tmux/tty.c	2009/10/21 16:52:30	1.57
***************
*** 1,4 ****
! /* $OpenBSD: tty.c,v 1.56 2009/10/21 13:42:44 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tty.c,v 1.57 2009/10/21 16:52:30 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 851,867 ****
  {
  	struct window_pane	*wp = ctx->wp;
  	struct screen		*s = wp->screen;
! 	u_int			 cx;
  
  	tty_region_pane(tty, ctx, ctx->orupper, ctx->orlower);
  
! 	/*
! 	 * Should the cursor be in the last cursor position ready for a natural
! 	 * wrap? If so - and it isn't - move to and rewrite the last cell.
! 	 */
! 	if (!(tty->term->flags & TERM_EARLYWRAP) &&
! 	    ctx->ocx + wp->xoff > tty->sx - ctx->last_width) {
! 		if (tty->cx < tty->sx) {
  			cx = screen_size_x(s) - ctx->last_width;
  			tty_cursor_pane(tty, ctx, cx, ctx->ocy);
  			tty_cell(tty, &ctx->last_cell, &ctx->last_utf8);
--- 851,874 ----
  {
  	struct window_pane	*wp = ctx->wp;
  	struct screen		*s = wp->screen;
! 	u_int			 cx, sx;
  
  	tty_region_pane(tty, ctx, ctx->orupper, ctx->orlower);
  
! 	/* Is the cursor in the very last position? */
! 	if (ctx->ocx > wp->sx - ctx->last_width) {
! 		if (wp->xoff != 0 || wp->sx != tty->sx) {
! 			/*
! 			 * The pane doesn't fill the entire line, the linefeed
! 			 * will already have happened, so just move the cursor.
! 			 */
! 			tty_cursor_pane(tty, ctx, 0, ctx->ocy + 1);
! 		} else if (tty->cx < tty->sx) {
! 			/*
! 			 * The cursor isn't in the last position already, so
! 			 * move as far left as possinble and redraw the last
! 			 * cell to move into the last position.
! 			 */
  			cx = screen_size_x(s) - ctx->last_width;
  			tty_cursor_pane(tty, ctx, cx, ctx->ocy);
  			tty_cell(tty, &ctx->last_cell, &ctx->last_utf8);