aboutsummaryrefslogtreecommitdiff
path: root/cmd-set-option.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2009-09-02 01:02:44 +0000
committerTiago Cunha <tcunha@gmx.com>2009-09-02 01:02:44 +0000
commita3a150faf22fe1d8303e8e92aa2a6d92e7e10b5c (patch)
treed1ab94890474f4ecb77b3d482390ad7f61f4033e /cmd-set-option.c
parentce5c441f0fddc70c9ac982eb4741d3d0230d51a2 (diff)
downloadrtmux-a3a150faf22fe1d8303e8e92aa2a6d92e7e10b5c.tar.gz
rtmux-a3a150faf22fe1d8303e8e92aa2a6d92e7e10b5c.tar.bz2
rtmux-a3a150faf22fe1d8303e8e92aa2a6d92e7e10b5c.zip
Sync OpenBSD patchset 305:
When using tmux as a login shell, there is currently no way to specify a shell to be used as a login shell inside tmux, so add a default-shell session option. This sets the shell invoked as a login shell when the default-command option is empty. The default option value is whichever of $SHELL, getpwuid(getuid())'s pw_shell or /bin/sh is valid first. Based on a diff from martynas@, changed by me to be a session option rather than a window option.
Diffstat (limited to 'cmd-set-option.c')
-rw-r--r--cmd-set-option.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd-set-option.c b/cmd-set-option.c
index 923d58fd..52d79395 100644
--- a/cmd-set-option.c
+++ b/cmd-set-option.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-set-option.c,v 1.77 2009-08-31 22:30:15 tcunha Exp $ */
+/* $Id: cmd-set-option.c,v 1.78 2009-09-02 01:02:44 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -55,6 +55,7 @@ const struct set_option_entry set_option_table[] = {
{ "buffer-limit", SET_OPTION_NUMBER, 1, INT_MAX, NULL },
{ "default-command", SET_OPTION_STRING, 0, 0, NULL },
{ "default-path", SET_OPTION_STRING, 0, 0, NULL },
+ { "default-shell", SET_OPTION_STRING, 0, 0, NULL },
{ "default-terminal", SET_OPTION_STRING, 0, 0, NULL },
{ "display-panes-colour", SET_OPTION_COLOUR, 0, 0, NULL },
{ "display-panes-time", SET_OPTION_NUMBER, 1, INT_MAX, NULL },