From a3a150faf22fe1d8303e8e92aa2a6d92e7e10b5c Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Wed, 2 Sep 2009 01:02:44 +0000 Subject: 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. --- names.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'names.c') 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 @@ -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 * -- cgit