===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/input.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -c -r1.88 -r1.89
*** src/usr.bin/tmux/input.c	2015/11/12 11:09:11	1.88
--- src/usr.bin/tmux/input.c	2015/11/13 08:09:28	1.89
***************
*** 1,4 ****
! /* $OpenBSD: input.c,v 1.88 2015/11/12 11:09:11 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: input.c,v 1.89 2015/11/13 08:09:28 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 1006,1012 ****
  	else
  		ictx->cell.cell.attr &= ~GRID_ATTR_CHARSET;
  
! 	grid_cell_one(&ictx->cell.cell, ictx->ch);
  	screen_write_cell(&ictx->ctx, &ictx->cell.cell);
  
  	ictx->cell.cell.attr &= ~GRID_ATTR_CHARSET;
--- 1006,1012 ----
  	else
  		ictx->cell.cell.attr &= ~GRID_ATTR_CHARSET;
  
! 	utf8_set(&ictx->cell.cell.data, ictx->ch);
  	screen_write_cell(&ictx->ctx, &ictx->cell.cell);
  
  	ictx->cell.cell.attr &= ~GRID_ATTR_CHARSET;
***************
*** 1945,1951 ****
  
  	utf8_append(&ictx->utf8data, ictx->ch);
  
! 	grid_cell_set(&ictx->cell.cell, &ictx->utf8data);
  	screen_write_cell(&ictx->ctx, &ictx->cell.cell);
  
  	return (0);
--- 1945,1951 ----
  
  	utf8_append(&ictx->utf8data, ictx->ch);
  
! 	utf8_copy(&ictx->cell.cell.data, &ictx->utf8data);
  	screen_write_cell(&ictx->ctx, &ictx->cell.cell);
  
  	return (0);