Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2026-06-23 13:00:09 +01:00
3 changed files with 11 additions and 10 deletions

2
tmux.1
View File

@@ -3605,7 +3605,7 @@ The
flag will create an empty pane and forward any output from stdin to it.
For example:
.Bd -literal -offset indent
$ make 2>&1|tmux splitw \-dI &
$ make 2>&1|tmux new\-pane \-dI &
.Ed
.Pp
All other options have the same meaning as for the

View File

@@ -472,6 +472,7 @@ window_customize_build_keys(struct window_customize_modedata *data,
expanded = format_expand(ft, filter);
if (!format_true(expanded)) {
free(expanded);
bd = key_bindings_next(kt, bd);
continue;
}
free(expanded);

View File

@@ -2176,6 +2176,15 @@ window_pane_status_get_range(struct window_pane *wp, u_int x, u_int y)
return (style_ranges_get_range(srs, x - wp->xoff - 2));
}
enum pane_lines
window_get_pane_lines(struct window *w)
{
struct options *oo;
oo = w->options;
return (options_get_number(oo, "pane-border-lines"));
}
enum pane_lines
window_pane_get_pane_lines(struct window_pane *wp)
{
@@ -2188,15 +2197,6 @@ window_pane_get_pane_lines(struct window_pane *wp)
return (options_get_number(oo, "pane-border-lines"));
}
enum pane_lines
window_get_pane_lines(struct window *w)
{
struct options *oo;
oo = w->options;
return (options_get_number(oo, "pane-border-lines"));
}
int
window_get_pane_status(struct window *w)
{