===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/screen.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -c -r1.40 -r1.41
*** src/usr.bin/tmux/screen.c	2016/09/02 20:57:20	1.40
--- src/usr.bin/tmux/screen.c	2016/10/10 21:29:23	1.41
***************
*** 1,4 ****
! /* $OpenBSD: screen.c,v 1.40 2016/09/02 20:57:20 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: screen.c,v 1.41 2016/10/10 21:29:23 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 24,31 ****
  
  #include "tmux.h"
  
! void	screen_resize_x(struct screen *, u_int);
! void	screen_resize_y(struct screen *, u_int);
  
  /* Create a new screen. */
  void
--- 24,31 ----
  
  #include "tmux.h"
  
! static void	screen_resize_x(struct screen *, u_int);
! static void	screen_resize_y(struct screen *, u_int);
  
  /* Create a new screen. */
  void
***************
*** 139,145 ****
  		screen_reflow(s, sx);
  }
  
! void
  screen_resize_x(struct screen *s, u_int sx)
  {
  	struct grid		*gd = s->grid;
--- 139,145 ----
  		screen_reflow(s, sx);
  }
  
! static void
  screen_resize_x(struct screen *s, u_int sx)
  {
  	struct grid		*gd = s->grid;
***************
*** 161,167 ****
  	gd->sx = sx;
  }
  
! void
  screen_resize_y(struct screen *s, u_int sy)
  {
  	struct grid	*gd = s->grid;
--- 161,167 ----
  	gd->sx = sx;
  }
  
! static void
  screen_resize_y(struct screen *s, u_int sy)
  {
  	struct grid	*gd = s->grid;
***************
*** 221,228 ****
  		needed = sy - oldy;
  
  		/*
! 		 * Try to pull as much as possible out of scrolled history, if is
! 		 * is enabled.
  		 */
  		available = gd->hscrolled;
  		if (gd->flags & GRID_HISTORY && available > 0) {
--- 221,228 ----
  		needed = sy - oldy;
  
  		/*
! 		 * Try to pull as much as possible out of scrolled history, if
! 		 * is is enabled.
  		 */
  		available = gd->hscrolled;
  		if (gd->flags & GRID_HISTORY && available > 0) {