circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 05:21:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2020-04-13 10:30:00 +01:00
parent 52e3d960e7 c20eb0c0ae
commit b117c3b812
74 changed files with 538 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
format.c
View File

@ -1128,8 +1128,10 @@ format_create_add_item(struct format_tree *ft, struct cmdq_item *item)
struct window_pane *wp;
u_int x, y;
if (item->cmd != NULL)
format_add(ft, "command", "%s", item->cmd->entry->name);
if (item->cmd != NULL) {
format_add(ft, "command", "%s",
cmd_get_entry (item->cmd)->name);
}
if (item->shared == NULL)
return;
@ -1617,7 +1619,7 @@ format_build_modifiers(struct format_tree *ft, const char **s, u_int *count)
return (NULL);
}
*s = cp + 1;
return list;
return (list);
}
/* Match against an fnmatch(3) pattern or regular expression. */
@ -1909,7 +1911,7 @@ format_replace_expression(struct format_modifier *mexp, struct format_tree *ft,
free(right);
free(left);
return value;
return (value);
fail:
free(right);