===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -c -r1.50 -r1.51
*** src/usr.bin/tmux/tty.c	2009/10/17 08:24:46	1.50
--- src/usr.bin/tmux/tty.c	2009/10/17 08:35:38	1.51
***************
*** 1,4 ****
! /* $OpenBSD: tty.c,v 1.50 2009/10/17 08:24:46 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tty.c,v 1.51 2009/10/17 08:35:38 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 850,856 ****
  	 * 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 (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);
--- 850,857 ----
  	 * 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);