circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-06-04 09:20:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2026-06-03 21:30:06 +01:00
parent cfeade6055 580f9ced08
commit 019f8eb278
3 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
format.c
View File

@@ -5616,7 +5616,7 @@ format_expand1(struct format_expand_state *es, const char *fmt)
const char *ptr, *s, *style_end = NULL; const char *ptr, *s, *style_end = NULL;
size_t off, len, n, outlen; size_t off, len, n, outlen;
int ch, brackets; int ch, brackets;
char expanded[8192], number[2] = { 0 }; char expanded[8192];
if (fmt == NULL || *fmt == '\0' || !format_check_time(es)) if (fmt == NULL || *fmt == '\0' || !format_check_time(es))
return (xstrdup("")); return (xstrdup(""));
@@ -5746,13 +5746,6 @@ format_expand1(struct format_expand_state *es, const char *fmt)
continue; continue;
default: default:
s = NULL; s = NULL;
if (ch >= '1' && ch <= '9') {
number[0] = ch;
if (format_replace(es, number, 1, &buf, &len,
&off) != 0)
break;
continue;
}
if (fmt > style_end) { /* skip inside #[] */ if (fmt > style_end) { /* skip inside #[] */
if (ch >= 'A' && ch <= 'Z') if (ch >= 'A' && ch <= 'Z')
s = format_upper[ch - 'A']; s = format_upper[ch - 'A'];

3
tmux.1
View File

@@ -7870,9 +7870,6 @@ section.
If If
.Ar argument .Ar argument
values are given, they are available as values are given, they are available as
.Ql #1 ,
.Ql #2
or
.Ql #{1} , .Ql #{1} ,
.Ql #{2} .Ql #{2}
and so on. and so on.

2
tty.c
View File

@@ -1004,7 +1004,7 @@ tty_window_offset1(struct tty *tty, u_int *ox, u_int *oy, u_int *sx, u_int *sy)
else if (cy > w->sy - *sy) else if (cy > w->sy - *sy)
*oy = w->sy - *sy; *oy = w->sy - *sy;
else else
*oy = cy - *sy / 2; *oy = cy - *sy + 1;
} }
c->pan_window = NULL; c->pan_window = NULL;