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 /cmd-split-window.c | |
| parent | 147b5ae5145dc29e9bf4d0ebbc635939b6fdc60b (diff) | |
| parent | 44657bf932b068aff5ce1019a4e8a2e7b00b5321 (diff) | |
Merge branch 'obsd-master'
Conflicts:
Makefile
client.c
server-client.c
server.c
tmux.c
tmux.h
Diffstat (limited to 'cmd-split-window.c')
| -rw-r--r-- | cmd-split-window.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd-split-window.c b/cmd-split-window.c index 99da5f1c..026f951f 100644 --- a/cmd-split-window.c +++ b/cmd-split-window.c @@ -72,7 +72,7 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq) server_fill_environ(s, &env); if (args->argc == 0) { - cmd = options_get_string(&s->options, "default-command"); + cmd = options_get_string(s->options, "default-command"); if (cmd != NULL && *cmd != '\0') { argc = 1; argv = (char **)&cmd; @@ -134,9 +134,9 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq) else size = (wp->sx * percentage) / 100; } - hlimit = options_get_number(&s->options, "history-limit"); + hlimit = options_get_number(s->options, "history-limit"); - shell = options_get_string(&s->options, "default-shell"); + shell = options_get_string(s->options, "default-shell"); if (*shell == '\0' || areshell(shell)) shell = _PATH_BSHELL; |