summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--format.c2
-rw-r--r--layout-custom.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/format.c b/format.c
index e1a6360a..75521fd0 100644
--- a/format.c
+++ b/format.c
@@ -1700,7 +1700,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);
diff --git a/layout-custom.c b/layout-custom.c
index 4d9e818b..bedcaf10 100644
--- a/layout-custom.c
+++ b/layout-custom.c
@@ -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. */