diff options
| author | Thomas Adam <thomas@xteddy.org> | 2019-06-15 09:02:26 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2019-06-15 09:02:26 +0100 |
| commit | 5895f1d9f742c9b4bcc1de3cf3bebe2601f673b3 (patch) | |
| tree | fea3b91e3f5170eef4e4d867d9fc14b5b7c59c3d | |
| parent | fadbf497a4d0abb21e9c94a56a7b9e77572ca3ef (diff) | |
| parent | 03da0ced46e0ddcfbdcc6d580d906f47279cabcd (diff) | |
| download | rtmux-5895f1d9f742c9b4bcc1de3cf3bebe2601f673b3.tar.gz rtmux-5895f1d9f742c9b4bcc1de3cf3bebe2601f673b3.tar.bz2 rtmux-5895f1d9f742c9b4bcc1de3cf3bebe2601f673b3.zip | |
Merge branch 'obsd-master'
| -rw-r--r-- | format.c | 2 | ||||
| -rw-r--r-- | layout-custom.c | 5 |
2 files changed, 3 insertions, 4 deletions
@@ -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); 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. */ |