mirror of
https://github.com/tmux/tmux.git
synced 2024-12-13 10:08:47 +00:00
Revert r1.5, I don't like it, new sessions should start off identically - with
the defaults.
This commit is contained in:
parent
e0d1954840
commit
895171478f
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user