diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2009-07-23 15:47:57 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2009-07-23 15:47:57 +0000 |
| commit | bb70924ff1829701e4a340e56ad86743e511a4c8 (patch) | |
| tree | 349b6a0c5b6ca54e0e559d82526b6f197505f296 /usr.bin | |
| parent | cd00811aa2c5ed8421f50c3609cb6c447e36cfb4 (diff) | |
Revert r1.5, I don't like it, new sessions should start off identically - with
the defaults.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/tmux/cmd-new-session.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/usr.bin/tmux/cmd-new-session.c b/usr.bin/tmux/cmd-new-session.c index 3a27b855a58..e1c83315222 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.6 2009/07/23 12:33:48 nicm Exp $ */ +/* $OpenBSD: cmd-new-session.c,v 1.7 2009/07/23 15:47:56 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -112,7 +112,6 @@ 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; int detached; u_int sx, sy; @@ -159,14 +158,6 @@ 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 && ctx->curclient != NULL) - oo = &ctx->curclient->session->options; - /* Find new session size and options. */ if (detached) { sx = 80; @@ -180,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(oo, "status")) + if (sy > 0 && options_get_number(&global_s_options, "status")) sy--; if (sx == 0) sx = 1; @@ -189,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(oo, "default-path"); + cwd = options_get_string(&global_s_options, "default-path"); if (data->cmd != NULL) cmd = data->cmd; else - cmd = options_get_string(oo, "default-command"); + cmd = options_get_string(&global_s_options, "default-command"); /* Create the new session. */ s = session_create(data->newname, cmd, cwd, sx, sy, &cause); |