circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 22:43:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	cfg.c
	tmux.c
This commit is contained in:
Thomas Adam
2015-09-06 20:47:50 +01:00
parent 2ebef95994 aceae73b9a
commit 76688d2040
17 changed files with 346 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
format.c
View File

@ -220,8 +220,7 @@ format_job_get(struct format_tree *ft, const char *cmd)
struct format_job fj0, *fj;
fj0.cmd = cmd;
if ((fj = RB_FIND(format_job_tree, &format_jobs, &fj0)) == NULL)
{
if ((fj = RB_FIND(format_job_tree, &format_jobs, &fj0)) == NULL) {
fj = xcalloc(1, sizeof *fj);
fj->cmd = xstrdup(cmd);
fj->status = ft->status;