===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -c -r1.53 -r1.54
*** src/usr.bin/tmux/tty.c	2009/10/20 17:33:33	1.53
--- src/usr.bin/tmux/tty.c	2009/10/20 19:18:28	1.54
***************
*** 1,4 ****
! /* $OpenBSD: tty.c,v 1.53 2009/10/20 17:33:33 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tty.c,v 1.54 2009/10/20 19:18:28 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 342,348 ****
  void
  tty_pututf8(struct tty *tty, const struct grid_utf8 *gu)
  {
! 	u_int	i, width;
  
  	for (i = 0; i < UTF8_SIZE; i++) {
  		if (gu->data[i] == 0xff)
--- 342,348 ----
  void
  tty_pututf8(struct tty *tty, const struct grid_utf8 *gu)
  {
! 	u_int	i;
  
  	for (i = 0; i < UTF8_SIZE; i++) {
  		if (gu->data[i] == 0xff)
***************
*** 352,359 ****
  			write(tty->log_fd, &gu->data[i], 1);
  	}
  
! 	width = utf8_width(gu->data);
! 	tty->cx += width;
  }
  
  void
--- 352,358 ----
  			write(tty->log_fd, &gu->data[i], 1);
  	}
  
! 	tty->cx += gu->width;
  }
  
  void