===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty.c,v
retrieving revision 1.173
retrieving revision 1.174
diff -c -r1.173 -r1.174
*** src/usr.bin/tmux/tty.c	2015/02/05 11:46:57	1.173
--- src/usr.bin/tmux/tty.c	2015/04/15 22:10:13	1.174
***************
*** 1,4 ****
! /* $OpenBSD: tty.c,v 1.173 2015/02/05 11:46:57 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tty.c,v 1.174 2015/04/15 22:10:13 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 629,635 ****
  		sx = tty->sx;
  
  	/*
! 	 * Don't move the cursor to the start permission if it will wrap there
  	 * itself.
  	 */
  	gl = NULL;
--- 629,635 ----
  		sx = tty->sx;
  
  	/*
! 	 * Don't move the cursor to the start position if it will wrap there
  	 * itself.
  	 */
  	gl = NULL;
***************
*** 1407,1413 ****
  		 *
  		 * Otherwise, try to set the default colour only as needed.
  		 */
! 		have_ax = tty_term_has(tty->term, TTYC_AX);
  		if (!have_ax && tty_term_has(tty->term, TTYC_OP))
  			tty_reset(tty);
  		else {
--- 1407,1413 ----
  		 *
  		 * Otherwise, try to set the default colour only as needed.
  		 */
! 		have_ax = tty_term_flag(tty->term, TTYC_AX);
  		if (!have_ax && tty_term_has(tty->term, TTYC_OP))
  			tty_reset(tty);
  		else {