circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-10 20:24:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2026-06-23 13:00:09 +01:00
parent 6643acb375 de086f9848
commit a63e429d22
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tmux.1
View File

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

1
window-customize.c
View File

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

18
window.c
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)); 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 enum pane_lines
window_pane_get_pane_lines(struct window_pane *wp) 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")); 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 int
window_get_pane_status(struct window *w) window_get_pane_status(struct window *w)
{ {