===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/grid.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -c -r1.42 -r1.43
*** src/usr.bin/tmux/grid.c	2015/04/23 07:45:50	1.42
--- src/usr.bin/tmux/grid.c	2015/05/08 15:56:49	1.43
***************
*** 1,4 ****
! /* $OpenBSD: grid.c,v 1.42 2015/04/23 07:45:50 deraadt Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: grid.c,v 1.43 2015/05/08 15:56:49 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 49,82 ****
  
  int	grid_check_y(struct grid *, u_int);
  
! #ifdef DEBUG
  int
  grid_check_y(struct grid *gd, u_int py)
  {
- 	if ((py) >= (gd)->hsize + (gd)->sy)
- 		log_fatalx("y out of range: %u", py);
- 	return (0);
- }
- #else
- int
- grid_check_y(struct grid *gd, u_int py)
- {
  	if ((py) >= (gd)->hsize + (gd)->sy) {
  		log_debug("y out of range: %u", py);
  		return (-1);
  	}
  	return (0);
  }
- #endif
- 
- void	grid_reflow_join(struct grid *, u_int *, struct grid_line *, u_int);
- void	grid_reflow_split(struct grid *, u_int *, struct grid_line *, u_int,
- 	    u_int);
- void	grid_reflow_move(struct grid *, u_int *, struct grid_line *);
- size_t	grid_string_cells_fg(const struct grid_cell *, int *);
- size_t	grid_string_cells_bg(const struct grid_cell *, int *);
- void	grid_string_cells_code(const struct grid_cell *,
- 	    const struct grid_cell *, char *, size_t, int);
  
  /* Create a new grid. */
  struct grid *
--- 49,73 ----
  
  int	grid_check_y(struct grid *, u_int);
  
! void	grid_reflow_join(struct grid *, u_int *, struct grid_line *, u_int);
! void	grid_reflow_split(struct grid *, u_int *, struct grid_line *, u_int,
! 	    u_int);
! void	grid_reflow_move(struct grid *, u_int *, struct grid_line *);
! size_t	grid_string_cells_fg(const struct grid_cell *, int *);
! size_t	grid_string_cells_bg(const struct grid_cell *, int *);
! void	grid_string_cells_code(const struct grid_cell *,
! 	    const struct grid_cell *, char *, size_t, int);
! 
! /* Check grid y position. */
  int
  grid_check_y(struct grid *gd, u_int py)
  {
  	if ((py) >= (gd)->hsize + (gd)->sy) {
  		log_debug("y out of range: %u", py);
  		return (-1);
  	}
  	return (0);
  }
  
  /* Create a new grid. */
  struct grid *