===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.918
retrieving revision 1.919
diff -c -r1.918 -r1.919
*** src/usr.bin/tmux/tmux.h	2019/07/01 06:56:00	1.918
--- src/usr.bin/tmux/tmux.h	2019/07/06 20:37:29	1.919
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.918 2019/07/01 06:56:00 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.919 2019/07/06 20:37:29 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 596,608 ****
  
  /* Grid cell data. */
  struct grid_cell {
! 	u_char			flags;
  	u_short			attr;
  	int			fg;
  	int			bg;
  	int			us;
! 	struct utf8_data	data;
! };
  struct grid_cell_entry {
  	u_char			flags;
  	union {
--- 596,608 ----
  
  /* Grid cell data. */
  struct grid_cell {
! 	struct utf8_data	data; /* 21 bytes */
  	u_short			attr;
+ 	u_char			flags;
  	int			fg;
  	int			bg;
  	int			us;
! } __packed;
  struct grid_cell_entry {
  	u_char			flags;
  	union {