summaryrefslogtreecommitdiffstats
path: root/cmd-new-session.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2009-08-09 15:26:24 +0000
committerTiago Cunha <tcunha@gmx.com>2009-08-09 15:26:24 +0000
commit15f6a41a753196bd59607f1ca0ea082608bbc3eb (patch)
treec1e0bf5354d9079c3218c474f1780df9ceaecbb8 /cmd-new-session.c
parent75b6736cf45d4b7b8b4873b4ad6d0cb85e56dcfb (diff)
Sync OpenBSD patchset 211:
Add a terminal-overrides session option allowing individual terminfo(5) entries to be overridden. The 88col/256col checks are now moved into the default setting and out of the code. Also remove a couple of old workarounds for xterm and rxvt which are no longer necessary (tmux can emulate them if missing).
Diffstat (limited to 'cmd-new-session.c')
-rw-r--r--cmd-new-session.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/cmd-new-session.c b/cmd-new-session.c
index 98a48074..21c7902a 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-new-session.c,v 1.49 2009-07-28 22:12:16 tcunha Exp $ */
+/* $Id: cmd-new-session.c,v 1.50 2009-08-09 15:26:24 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -108,7 +108,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
{
struct cmd_new_session_data *data = self->data;
struct session *s;
- char *cmd, *cwd, *cause;
+ char *overrides, *cmd, *cwd, *cause;
int detached;
u_int sx, sy;
@@ -147,7 +147,9 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
return (-1);
}
- if (tty_open(&ctx->cmdclient->tty, &cause) != 0) {
+ overrides =
+ options_get_string(&global_s_options, "terminal-overrides");
+ if (tty_open(&ctx->cmdclient->tty, overrides, &cause) != 0) {
ctx->error(ctx, "open terminal failed: %s", cause);
xfree(cause);
return (-1);