aboutsummaryrefslogtreecommitdiff
path: root/cmd-new-session.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2008-06-19 22:04:02 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2008-06-19 22:04:02 +0000
commit73d1558ed0a7feb9bb90767b1852f8a989136c0d (patch)
tree1772762b5922313ce14620afc10666ed5d832277 /cmd-new-session.c
parent24cc3626dc811ba28aa39f46b5abde57d61c2118 (diff)
downloadrtmux-73d1558ed0a7feb9bb90767b1852f8a989136c0d.tar.gz
rtmux-73d1558ed0a7feb9bb90767b1852f8a989136c0d.tar.bz2
rtmux-73d1558ed0a7feb9bb90767b1852f8a989136c0d.zip
status-lines -> status, prefix-key -> prefix
Diffstat (limited to 'cmd-new-session.c')
-rw-r--r--cmd-new-session.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/cmd-new-session.c b/cmd-new-session.c
index 119f090b..0baa5088 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-new-session.c,v 1.28 2008-06-18 16:39:15 nicm Exp $ */
+/* $Id: cmd-new-session.c,v 1.29 2008-06-19 22:04:02 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -116,7 +116,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
struct client *c = ctx->cmdclient;
struct session *s;
char *cmd, *cause;
- u_int sx, sy, slines;
+ u_int sx, sy;
if (ctx->flags & CMD_KEY)
return;
@@ -148,10 +148,12 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
sy = c->sy;
}
- slines = options_get_number(&global_options, "status-lines");
- if (sy < slines)
- sy = slines + 1;
- sy -= slines;
+ if (options_get_number(&global_options, "status")) {
+ if (sy == 0)
+ sy = 1;
+ else
+ sy--;
+ }
if (!data->flag_detached && tty_open(&c->tty, &cause) != 0) {
ctx->error(ctx, "%s", cause);