circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2017-03-08 14:01:23 +00:00
parent 5d3296c53b 6b2009ad72
commit 3ea36830f3
11 changed files with 49 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
format.c
View File

@@ -519,7 +519,6 @@ format_merge(struct format_tree *ft, struct format_tree *from)
if (fe->value != NULL)
format_add(ft, fe->key, "%s", fe->value);
}
}
/* Create a new tree. */
@@ -1081,6 +1080,22 @@ format_expand(struct format_tree *ft, const char *fmt)
return (buf);
}
/* Expand a single string. */
char *
format_single(struct cmdq_item *item, const char *fmt, struct client *c,
struct session *s, struct winlink *wl, struct window_pane *wp)
{
struct format_tree *ft;
char *expanded;
ft = format_create(item, FORMAT_NONE, 0);
format_defaults(ft, c, s, wl, wp);
expanded = format_expand(ft, fmt);
format_free(ft);
return (expanded);
}
/* Set defaults for any of arguments that are not NULL. */
void
format_defaults(struct format_tree *ft, struct client *c, struct session *s,