circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-05 23:38:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2017-09-11 10:01:11 +01:00
commit d8c397d1b7
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
grid.c
View File

@ -292,12 +292,14 @@ grid_collect_history(struct grid *gd)
{ {
u_int ny; u_int ny;
if (gd->hsize < gd->hlimit) if (gd->hsize == 0 || gd->hsize < gd->hlimit)
return; return;
ny = gd->hlimit / 10; ny = gd->hlimit / 10;
if (ny < 1) if (ny < 1)
ny = 1; ny = 1;
if (ny > gd->hsize)
ny = gd->hsize;
/* /*
* Free the lines from 0 to ny then move the remaining lines over * Free the lines from 0 to ny then move the remaining lines over

12
tmux.1
View File

@ -1407,7 +1407,9 @@ specifies the initial sort order: one of
or or
.Ql activity . .Ql activity .
.Fl f .Fl f
specifies an initial filter. specifies an initial filter: the filter is a format - if it evaluates to zero,
the item in the list is not shown, otherwise it is shown.
If a filter would lead to an empty list, it is ignored.
.Fl F .Fl F
specifies the format for each item in the list. specifies the format for each item in the list.
.Fl N .Fl N
@ -1464,7 +1466,9 @@ specifies the initial sort order: one of
or or
.Ql time . .Ql time .
.Fl f .Fl f
specifies an initial filter. specifies an initial filter: the filter is a format - if it evaluates to zero,
the item in the list is not shown, otherwise it is shown.
If a filter would lead to an empty list, it is ignored.
.Fl F .Fl F
specifies the format for each item in the tree. specifies the format for each item in the tree.
.Fl N .Fl N
@ -4117,7 +4121,9 @@ specifies the initial sort order: one of
or or
.Ql size . .Ql size .
.Fl f .Fl f
specifies an initial filter. specifies an initial filter: the filter is a format - if it evaluates to zero,
the item in the list is not shown, otherwise it is shown.
If a filter would lead to an empty list, it is ignored.
.Fl F .Fl F
specifies the format for each item in the list. specifies the format for each item in the list.
.Fl N .Fl N