diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2017-08-30 20:04:37 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2017-08-30 20:04:37 +0100 |
| commit | 07d3c4d882b378b65f8ab5e99f8fffbeb797b2ab (patch) | |
| tree | e2425144f608498903719c91182f34b445f0659c /grid-view.c | |
| parent | 07c679b52d18f198a60da2bd5b9b743bac55680f (diff) | |
| parent | f81e87f1e21f18a4d8fc01d33acb2fd86ae9f1bc (diff) | |
| download | rtmux-07d3c4d882b378b65f8ab5e99f8fffbeb797b2ab.tar.gz rtmux-07d3c4d882b378b65f8ab5e99f8fffbeb797b2ab.tar.bz2 rtmux-07d3c4d882b378b65f8ab5e99f8fffbeb797b2ab.zip | |
Merge branch 'master' into 2.6-rc
Diffstat (limited to 'grid-view.c')
| -rw-r--r-- | grid-view.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/grid-view.c b/grid-view.c index 033ec033..1bb77317 100644 --- a/grid-view.c +++ b/grid-view.c @@ -75,7 +75,7 @@ grid_view_clear_history(struct grid *gd, u_int bg) /* Scroll the lines into the history. */ for (yy = 0; yy < last; yy++) { - grid_collect_history(gd, bg); + grid_collect_history(gd); grid_scroll_history(gd, bg); } if (last < gd->sy) @@ -100,7 +100,7 @@ grid_view_scroll_region_up(struct grid *gd, u_int rupper, u_int rlower, u_int bg) { if (gd->flags & GRID_HISTORY) { - grid_collect_history(gd, bg); + grid_collect_history(gd); if (rupper == 0 && rlower == gd->sy - 1) grid_scroll_history(gd, bg); else { |