aboutsummaryrefslogtreecommitdiff
path: root/window.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2013-03-25 15:59:57 +0000
committerNicholas Marriott <nicm@openbsd.org>2013-03-25 15:59:57 +0000
commite44bd9f750bc374ae116a849e7ccde4efabc034a (patch)
tree3d01e5f4520c05cdd01c6d4b30e67c8d1bc53c2c /window.c
parent58bb6f8c5650d496fb3b872766c0278aa024631d (diff)
downloadrtmux-e44bd9f750bc374ae116a849e7ccde4efabc034a.tar.gz
rtmux-e44bd9f750bc374ae116a849e7ccde4efabc034a.tar.bz2
rtmux-e44bd9f750bc374ae116a849e7ccde4efabc034a.zip
Revert the command-prefix change which breaks sequences of commands.
Diffstat (limited to 'window.c')
-rw-r--r--window.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/window.c b/window.c
index 0ab36033..0f445edc 100644
--- a/window.c
+++ b/window.c
@@ -314,24 +314,15 @@ window_create(const char *name, const char *cmd, const char *shell,
{
struct window *w;
struct window_pane *wp;
- const char *prefix;
- char *cmd1;
w = window_create1(sx, sy);
wp = window_add_pane(w, hlimit);
layout_init(w, wp);
- if (*cmd != '\0') {
- prefix = options_get_string(&w->options, "command-prefix");
- xasprintf(&cmd1, "%s%s", prefix, cmd);
- } else
- cmd1 = xstrdup("");
- if (window_pane_spawn(wp, cmd1, shell, cwd, env, tio, cause) != 0) {
+ if (window_pane_spawn(wp, cmd, shell, cwd, env, tio, cause) != 0) {
window_destroy(w);
- free(cmd1);
return (NULL);
}
- free(cmd1);
w->active = TAILQ_FIRST(&w->panes);
if (name != NULL) {