aboutsummaryrefslogtreecommitdiff
path: root/names.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 /names.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 'names.c')
-rw-r--r--names.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/names.c b/names.c
index 6ff272bd..ee366aba 100644
--- a/names.c
+++ b/names.c
@@ -1,4 +1,4 @@
-/* $Id: names.c,v 1.14 2009-08-20 11:44:18 tcunha Exp $ */
+/* $Id: names.c,v 1.15 2009-09-02 01:02:44 tcunha Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -90,7 +90,7 @@ default_window_name(struct window *w)
return (xstrdup("[tmux]"));
if (w->active->cmd != NULL && *w->active->cmd != '\0')
return (parse_window_name(w->active->cmd));
- return (parse_window_name(window_default_command()));
+ return (parse_window_name(w->active->shell));
}
char *