diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-10-27 23:27:26 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-10-27 23:27:26 +0000 |
| commit | da1f6fc2c8477c99e986061bcdd7c3e854a60076 (patch) | |
| tree | f5934e2f96c43f80bad7e3a219230d6337c9d208 /layout-set.c | |
| parent | 147b5ae5145dc29e9bf4d0ebbc635939b6fdc60b (diff) | |
| parent | 44657bf932b068aff5ce1019a4e8a2e7b00b5321 (diff) | |
| download | rtmux-da1f6fc2c8477c99e986061bcdd7c3e854a60076.tar.gz rtmux-da1f6fc2c8477c99e986061bcdd7c3e854a60076.tar.bz2 rtmux-da1f6fc2c8477c99e986061bcdd7c3e854a60076.zip | |
Merge branch 'obsd-master'
Conflicts:
Makefile
client.c
server-client.c
server.c
tmux.c
tmux.h
Diffstat (limited to 'layout-set.c')
| -rw-r--r-- | layout-set.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/layout-set.c b/layout-set.c index da94cff2..852ec0f6 100644 --- a/layout-set.c +++ b/layout-set.c @@ -245,10 +245,10 @@ layout_set_main_h(struct window *w) width = (w->sx - (n - 1)) / columns; /* Get the main pane height and add one for separator line. */ - mainheight = options_get_number(&w->options, "main-pane-height") + 1; + mainheight = options_get_number(w->options, "main-pane-height") + 1; /* Get the optional other pane height and add one for separator line. */ - otherheight = options_get_number(&w->options, "other-pane-height") + 1; + otherheight = options_get_number(w->options, "other-pane-height") + 1; /* * If an other pane height was specified, honour it so long as it @@ -366,10 +366,10 @@ layout_set_main_v(struct window *w) height = (w->sy - (n - 1)) / rows; /* Get the main pane width and add one for separator line. */ - mainwidth = options_get_number(&w->options, "main-pane-width") + 1; + mainwidth = options_get_number(w->options, "main-pane-width") + 1; /* Get the optional other pane width and add one for separator line. */ - otherwidth = options_get_number(&w->options, "other-pane-width") + 1; + otherwidth = options_get_number(w->options, "other-pane-width") + 1; /* * If an other pane width was specified, honour it so long as it |