===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -c -r1.121 -r1.122
*** src/usr.bin/tmux/tty.c	2012/03/15 10:36:00	1.121
--- src/usr.bin/tmux/tty.c	2012/03/17 17:36:03	1.122
***************
*** 1,4 ****
! /* $OpenBSD: tty.c,v 1.121 2012/03/15 10:36:00 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tty.c,v 1.122 2012/03/17 17:36:03 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 1000,1006 ****
  			 * 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
--- 1000,1009 ----
  			 * 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->sy)
! 				tty_cursor_pane(tty, ctx, 0, ctx->ocy + 1);
! 			else
! 				tty_cursor_pane(tty, ctx, 0, ctx->ocy);
  		} else if (tty->cx < tty->sx) {
  			/*
  			 * The cursor isn't in the last position already, so