circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-05 15:28:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master' into master

Browse Source
This commit is contained in:
Thomas Adam 2021-02-09 16:01:18 +00:00
commit c6215b55e0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
format.c
View File

@ -367,7 +367,10 @@ format_job_get(struct format_expand_state *es, const char *cmd)
RB_INSERT(format_job_tree, jobs, fj); RB_INSERT(format_job_tree, jobs, fj);
} }
expanded = format_expand1(es, cmd); format_copy_state(&next, es, FORMAT_EXPAND_NOJOBS);
next.flags &= ~FORMAT_EXPAND_TIME;
expanded = format_expand1(&next, cmd);
if (fj->expanded == NULL || strcmp(expanded, fj->expanded) != 0) { if (fj->expanded == NULL || strcmp(expanded, fj->expanded) != 0) {
free((void *)fj->expanded); free((void *)fj->expanded);
fj->expanded = xstrdup(expanded); fj->expanded = xstrdup(expanded);
@ -393,7 +396,6 @@ format_job_get(struct format_expand_state *es, const char *cmd)
if (ft->flags & FORMAT_STATUS) if (ft->flags & FORMAT_STATUS)
fj->status = 1; fj->status = 1;
format_copy_state(&next, es, FORMAT_EXPAND_NOJOBS);
return (format_expand1(&next, fj->out)); return (format_expand1(&next, fj->out));
} }