===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/grid-view.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -c -r1.29 -r1.30
*** src/usr.bin/tmux/grid-view.c	2017/05/12 13:00:56	1.29
--- src/usr.bin/tmux/grid-view.c	2017/08/30 18:13:47	1.30
***************
*** 1,4 ****
! /* $OpenBSD: grid-view.c,v 1.29 2017/05/12 13:00:56 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: grid-view.c,v 1.30 2017/08/30 18:13:47 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 75,81 ****
  
  	/* Scroll the lines into the history. */
  	for (yy = 0; yy < last; yy++) {
! 		grid_collect_history(gd, bg);
  		grid_scroll_history(gd, bg);
  	}
  	if (last < gd->sy)
--- 75,81 ----
  
  	/* Scroll the lines into the history. */
  	for (yy = 0; yy < last; yy++) {
! 		grid_collect_history(gd);
  		grid_scroll_history(gd, bg);
  	}
  	if (last < gd->sy)
***************
*** 100,106 ****
      u_int bg)
  {
  	if (gd->flags & GRID_HISTORY) {
! 		grid_collect_history(gd, bg);
  		if (rupper == 0 && rlower == gd->sy - 1)
  			grid_scroll_history(gd, bg);
  		else {
--- 100,106 ----
      u_int bg)
  {
  	if (gd->flags & GRID_HISTORY) {
! 		grid_collect_history(gd);
  		if (rupper == 0 && rlower == gd->sy - 1)
  			grid_scroll_history(gd, bg);
  		else {