diff options
Diffstat (limited to 'usr.bin/tmux/cmd-new-session.c')
| -rw-r--r-- | usr.bin/tmux/cmd-new-session.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/usr.bin/tmux/cmd-new-session.c b/usr.bin/tmux/cmd-new-session.c index 56a0abba850..4fb33908f11 100644 --- a/usr.bin/tmux/cmd-new-session.c +++ b/usr.bin/tmux/cmd-new-session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-new-session.c,v 1.4 2009/07/17 15:03:11 nicm Exp $ */ +/* $OpenBSD: cmd-new-session.c,v 1.5 2009/07/22 22:47:43 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -112,6 +112,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx) { struct cmd_new_session_data *data = self->data; struct session *s; + struct options *oo; char *cmd, *cwd, *cause; u_int sx, sy; @@ -149,6 +150,14 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx) } } + /* + * If the called from inside, use the source session for the default + * path and command. + */ + oo = &global_s_options; + if (ctx->cmdclient == NULL) + oo = &ctx->curclient->session->options; + /* Find new session size and options. */ if (data->flag_detached) { sx = 80; @@ -162,7 +171,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx) sy = ctx->curclient->tty.sy; } } - if (sy > 0 && options_get_number(&global_s_options, "status")) + if (sy > 0 && options_get_number(oo, "status")) sy--; if (sx == 0) sx = 1; @@ -171,11 +180,11 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx) if (ctx->cmdclient != NULL && ctx->cmdclient->cwd != NULL) cwd = ctx->cmdclient->cwd; else - cwd = options_get_string(&global_s_options, "default-path"); + cwd = options_get_string(oo, "default-path"); if (data->cmd != NULL) cmd = data->cmd; else - cmd = options_get_string(&global_s_options, "default-command"); + cmd = options_get_string(oo, "default-command"); /* Create the new session. */ s = session_create(data->newname, cmd, cwd, sx, sy, &cause); |