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

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2019-06-15 09:02:26 +01:00
parent fadbf497a4 03da0ced46
commit 5895f1d9f7
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
format.c
View File

@@ -1716,7 +1716,7 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
else
value = xstrdup("0");
} else if (strcmp(cmp->modifier, "m") == 0)
value = format_match(fm, left, right);
value = format_match(cmp, left, right);
free(right);
free(left);

5
layout-custom.c
View File

@@ -122,7 +122,7 @@ layout_parse(struct window *w, const char *layout)
{
struct layout_cell *lc, *lcchild;
struct window_pane *wp;
u_int npanes, ncells, sx, sy;
u_int npanes, ncells;
u_short csum;
/* Check validity. */
@@ -153,8 +153,7 @@ layout_parse(struct window *w, const char *layout)
layout_destroy_cell(w, lcchild, &lc);
}
/* Save the old window size and resize to the layout size. */
sx = w->sx; sy = w->sy;
/* Resize to the layout size. */
window_resize(w, lc->sx, lc->sy);
/* Destroy the old layout and swap to the new. */