Merge branch 'obsd-master' into master

This commit is contained in:
Thomas Adam 2021-10-18 12:01:12 +01:00
commit 9e986d6a96
3 changed files with 19 additions and 35 deletions

2
menu.c
View File

@ -100,6 +100,8 @@ menu_add_item(struct menu *menu, const struct menu_item *item,
new_item->key = item->key;
width = format_width(new_item->name);
if (*new_item->name == '-')
width--;
if (width > menu->width)
menu->width = width;
}

18
tmux.1
View File

@ -4276,24 +4276,6 @@ see the
section.
Attributes are ignored.
.Pp
.It Ic popup-style Ar style
Set the popup style.
For how to specify
.Ar style ,
see the
.Sx STYLES
section.
Attributes are ignored.
.Pp
.It Ic popup-border-style Ar style
Set the popup border style.
For how to specify
.Ar style ,
see the
.Sx STYLES
section.
Attributes are ignored.
.Pp
.It Ic popup-border-lines Ar type
Set the type of characters used for drawing popup borders.
.Ar type