===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -c -r1.103 -r1.104
*** src/usr.bin/tmux/tty.c	2011/03/27 20:36:19	1.103
--- src/usr.bin/tmux/tty.c	2011/04/09 07:48:08	1.104
***************
*** 1,4 ****
! /* $OpenBSD: tty.c,v 1.103 2011/03/27 20:36:19 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tty.c,v 1.104 2011/04/09 07:48:08 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 1218,1224 ****
  	if (changed & GRID_ATTR_DIM)
  		tty_putcode(tty, TTYC_DIM);
  	if (changed & GRID_ATTR_ITALICS)
! 		tty_putcode(tty, TTYC_SMSO);
  	if (changed & GRID_ATTR_UNDERSCORE)
  		tty_putcode(tty, TTYC_SMUL);
  	if (changed & GRID_ATTR_BLINK)
--- 1218,1229 ----
  	if (changed & GRID_ATTR_DIM)
  		tty_putcode(tty, TTYC_DIM);
  	if (changed & GRID_ATTR_ITALICS)
! 	{
! 		if (tty_term_has(tty->term, TTYC_SITM))
! 			tty_putcode(tty, TTYC_SITM);
! 		else
! 			tty_putcode(tty, TTYC_SMSO);
! 	}
  	if (changed & GRID_ATTR_UNDERSCORE)
  		tty_putcode(tty, TTYC_SMUL);
  	if (changed & GRID_ATTR_BLINK)