===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/grid.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -c -r1.82 -r1.83
*** src/usr.bin/tmux/grid.c	2018/06/03 10:17:30	1.82
--- src/usr.bin/tmux/grid.c	2018/06/11 11:14:10	1.83
***************
*** 1,4 ****
! /* $OpenBSD: grid.c,v 1.82 2018/06/03 10:17:30 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: grid.c,v 1.83 2018/06/11 11:14:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 984,992 ****
  grid_reflow_join(struct grid *target, struct grid *gd, u_int sx, u_int yy,
      u_int width, u_int *cy, int already)
  {
! 	struct grid_line	*gl, *from;
  	struct grid_cell	 gc;
! 	u_int			 lines, want, left, i, to, line;
  	u_int			 at;
  	int			 wrapped = 1;
  
--- 984,992 ----
  grid_reflow_join(struct grid *target, struct grid *gd, u_int sx, u_int yy,
      u_int width, u_int *cy, int already)
  {
! 	struct grid_line	*gl, *from = NULL;
  	struct grid_cell	 gc;
! 	u_int			 lines, left, i, to, line, want = 0;
  	u_int			 at;
  	int			 wrapped = 1;