From b8bd24817f5a674d4d78fdaaf0df218a40603d21 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Thu, 2 Jul 2009 18:26:55 +0000 Subject: [PATCH] If using the default login shell (empty default-command), strip any - prefix. --- names.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/names.c b/names.c index 4df967f5..744013a9 100644 --- a/names.c +++ b/names.c @@ -1,4 +1,4 @@ -/* $Id: names.c,v 1.10 2009-07-02 18:17:46 nicm Exp $ */ +/* $Id: names.c,v 1.11 2009-07-02 18:26:55 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott @@ -59,7 +59,16 @@ set_window_names(void) if (name == NULL) wname = default_window_name(w); else { - wname = parse_window_name(name); + /* + * If tmux is using the default command, it will be a + * login shell and argv[0] may have a - prefix. Remove + * this if it is present. Ick. + */ + if (w->active->cmd != NULL && *w->active->cmd == '\0' && + name != NULL && name[0] == '-' && name[1] != '\0') + wname = parse_window_name(name + 1); + else + wname = parse_window_name(name); xfree(name); }