===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -c -r1.51 -r1.52
*** src/usr.bin/tmux/tty.c	2009/10/17 08:35:38	1.51
--- src/usr.bin/tmux/tty.c	2009/10/20 16:32:23	1.52
***************
*** 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>
--- 1,4 ----
! /* $OpenBSD: tty.c,v 1.52 2009/10/20 16:32:23 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 712,717 ****
--- 712,725 ----
  		tty_redraw_region(tty, ctx);
  		return;
  	}
+ 
+ 	/*
+ 	 * If this line wrapped naturally (ctx->num is nonzero), don't do
+ 	 * anything - the cursor can just be moved to the last cell and wrap
+ 	 * naturally.
+ 	 */
+ 	if (ctx->num && !(tty->term->flags & TERM_EARLYWRAP))
+ 		return;
  
  	if (ctx->ocy == ctx->orlower) {
  		tty_reset(tty);