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

Merge branch 'obsd-master' into master

Browse Source
This commit is contained in:
Thomas Adam
2021-08-20 20:01:27 +01:00
parent 41822ef782 6cbc83c6a6
commit 944fde7c57
13 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
format.c
View File

@ -4078,8 +4078,7 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
case 's':
if (fm->argc < 2)
break;
sub = xreallocarray (sub, nsub + 1,
sizeof *sub);
sub = xreallocarray(sub, nsub + 1, sizeof *sub);
sub[nsub++] = fm;
break;
case '=':
@ -4188,7 +4187,7 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
value = xstrdup("");
else
xasprintf(&value, "%c", c);
free (new);
free(new);
goto done;
}
@ -4752,7 +4751,7 @@ format_defaults(struct format_tree *ft, struct client *c, struct session *s,
if (wp != NULL)
format_defaults_pane(ft, wp);
pb = paste_get_top (NULL);
pb = paste_get_top(NULL);
if (pb != NULL)
format_defaults_paste_buffer(ft, pb);
}