diff options
| author | Thomas <thomas@xteddy.org> | 2013-03-25 16:30:37 +0000 |
|---|---|---|
| committer | Thomas <thomas@xteddy.org> | 2013-03-25 16:30:37 +0000 |
| commit | 00af2df1027301a31531321c12eae6ff32989a3a (patch) | |
| tree | ff4fc1452186d0f878c4c77475e9590b1ff1020e /cmd-split-window.c | |
| parent | be390c19913a84be7114ce4188006c8ac26b6345 (diff) | |
| parent | 972da2d498d6e410fd97c55fb422af7caf464622 (diff) | |
| download | rtmux-00af2df1027301a31531321c12eae6ff32989a3a.tar.gz rtmux-00af2df1027301a31531321c12eae6ff32989a3a.tar.bz2 rtmux-00af2df1027301a31531321c12eae6ff32989a3a.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-split-window.c')
| -rw-r--r-- | cmd-split-window.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/cmd-split-window.c b/cmd-split-window.c index 139f7e50..601dcb17 100644 --- a/cmd-split-window.c +++ b/cmd-split-window.c @@ -58,8 +58,8 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq) struct window *w; struct window_pane *wp, *new_wp = NULL; struct environ env; - const char *cmd, *cwd, *shell, *prefix; - char *cause, *new_cause, *cmd1; + const char *cmd, *cwd, *shell; + char *cause, *new_cause; u_int hlimit; int size, percentage; enum layout_type type; @@ -122,18 +122,9 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq) goto error; } new_wp = window_add_pane(w, hlimit); - - if (*cmd != '\0') { - prefix = options_get_string(&w->options, "command-prefix"); - xasprintf(&cmd1, "%s%s", prefix, cmd); - } else - cmd1 = xstrdup(""); - if (window_pane_spawn(new_wp, cmd1, shell, cwd, &env, s->tio, - &cause) != 0) { - free(cmd1); + if (window_pane_spawn( + new_wp, cmd, shell, cwd, &env, s->tio, &cause) != 0) goto error; - } - free(cmd1); layout_assign_pane(lc, new_wp); server_redraw_window(w); |