===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/screen-write.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -c -r1.135 -r1.136
*** src/usr.bin/tmux/screen-write.c	2017/11/15 19:21:24	1.135
--- src/usr.bin/tmux/screen-write.c	2018/01/12 16:43:47	1.136
***************
*** 1,4 ****
! /* $OpenBSD: screen-write.c,v 1.135 2017/11/15 19:21:24 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: screen-write.c,v 1.136 2018/01/12 16:43:47 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 1297,1306 ****
  			grid_view_get_cell(s->grid, xx, s->cy, &gc);
  			if (~gc.flags & GRID_FLAG_PADDING)
  				break;
! 			grid_view_set_cell(s->grid, xx, s->cy, &grid_default_cell);
  		}
  		if (gc.data.width > 1)
! 			grid_view_set_cell(s->grid, xx, s->cy, &grid_default_cell);
  	}
  
  	memcpy(&gc, &ci->gc, sizeof gc);
--- 1297,1308 ----
  			grid_view_get_cell(s->grid, xx, s->cy, &gc);
  			if (~gc.flags & GRID_FLAG_PADDING)
  				break;
! 			grid_view_set_cell(s->grid, xx, s->cy,
! 			    &grid_default_cell);
  		}
  		if (gc.data.width > 1)
! 			grid_view_set_cell(s->grid, xx, s->cy,
! 			    &grid_default_cell);
  	}
  
  	memcpy(&gc, &ci->gc, sizeof gc);
***************
*** 1333,1339 ****
  	 */
  
  	collect = 1;
! 	if (gc->data.width != 1 || gc->data.size != 1)
  		collect = 0;
  	else if (gc->attr & GRID_ATTR_CHARSET)
  		collect = 0;
--- 1335,1341 ----
  	 */
  
  	collect = 1;
! 	if (gc->data.width != 1 || gc->data.size != 1 || *gc->data.data >= 0x7f)
  		collect = 0;
  	else if (gc->attr & GRID_ATTR_CHARSET)
  		collect = 0;