circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-03-06 07:45:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2026-03-02 12:01:09 +00:00
parent d781d2eaa1 f33b14bda6
commit bbbfa8f360
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
format.c
View File

@@ -4447,6 +4447,9 @@ format_loop_sessions(struct format_expand_state *es, const char *fmt)
free(expanded); free(expanded);
} }
free(active);
free(all);
return (value); return (value);
} }
@@ -5239,13 +5242,11 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
done: done:
/* Expand again if required. */ /* Expand again if required. */
if (modifiers & FORMAT_EXPAND) { if (modifiers & FORMAT_EXPAND) {
format_copy_state(&next, es, FORMAT_EXPAND_NOJOBS); new = format_expand1(es, value);
new = format_expand1(&next, value);
free(value); free(value);
value = new; value = new;
} else if (modifiers & FORMAT_EXPANDTIME) { } else if (modifiers & FORMAT_EXPANDTIME) {
format_copy_state(&next, es, FORMAT_EXPAND_TIME| format_copy_state(&next, es, FORMAT_EXPAND_TIME);
FORMAT_EXPAND_NOJOBS);
new = format_expand1(&next, value); new = format_expand1(&next, value);
free(value); free(value);
value = new; value = new;

1
menu.c
View File

@@ -90,6 +90,7 @@ menu_add_item(struct menu *menu, const struct menu_item *item,
else else
s = format_single(qitem, item->name, c, NULL, NULL, NULL); s = format_single(qitem, item->name, c, NULL, NULL, NULL);
if (*s == '\0') { /* no item if empty after format expanded */ if (*s == '\0') { /* no item if empty after format expanded */
free(s);
menu->count--; menu->count--;
return; return;
} }

2
tmux.1
View File

@@ -2247,7 +2247,6 @@ Same as
.Ic scroll-down .Ic scroll-down
but also exit copy mode if the cursor reaches the bottom. but also exit copy mode if the cursor reaches the bottom.
.It Xo .It Xo
.It Xo
.Ic scroll-exit-on .Ic scroll-exit-on
.Xc .Xc
Turn on exiting copy mode when scrolling to the end of the buffer. Turn on exiting copy mode when scrolling to the end of the buffer.
@@ -2259,6 +2258,7 @@ Turn off exiting copy mode when scrolling to the end of the buffer.
.Ic scroll-exit-toggle .Ic scroll-exit-toggle
.Xc .Xc
Toggle exiting copy mode when scrolling to the end of the buffer. Toggle exiting copy mode when scrolling to the end of the buffer.
.It Xo
.Ic scroll-middle .Ic scroll-middle
(vi: z) (vi: z)
.Xc .Xc