From 08c724963631f5184014df7334c97b8b646a6a03 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Thu, 2 Jul 2009 18:17:46 +0000 Subject: [PATCH] Change default_window_name to use window_default_command if the actual cmd is empty. From Josh Elsasser. --- names.c | 6 ++++-- tmux.h | 3 ++- window.c | 4 +--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/names.c b/names.c index ed88025b..4df967f5 100644 --- a/names.c +++ b/names.c @@ -1,4 +1,4 @@ -/* $Id: names.c,v 1.9 2009-06-25 16:49:02 nicm Exp $ */ +/* $Id: names.c,v 1.10 2009-07-02 18:17:46 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott @@ -78,7 +78,9 @@ default_window_name(struct window *w) { if (w->active->screen != &w->active->base) return (xstrdup("[tmux]")); - return (parse_window_name(w->active->cmd)); + if (w->active->cmd != NULL && *w->active->cmd != '\0') + return (parse_window_name(w->active->cmd)); + return (parse_window_name(window_default_command())); } char * diff --git a/tmux.h b/tmux.h index fd4876a3..86f04ca4 100644 --- a/tmux.h +++ b/tmux.h @@ -1,4 +1,4 @@ -/* $Id: tmux.h,v 1.348 2009-07-01 23:06:32 nicm Exp $ */ +/* $Id: tmux.h,v 1.349 2009-07-02 18:17:46 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -1407,6 +1407,7 @@ int screen_check_selection(struct screen *, u_int, u_int); /* window.c */ extern struct windows windows; +const char *window_default_command(void); int window_cmp(struct window *, struct window *); int winlink_cmp(struct winlink *, struct winlink *); RB_PROTOTYPE(windows, window, entry, window_cmp); diff --git a/window.c b/window.c index 3b9f3123..533e8927 100644 --- a/window.c +++ b/window.c @@ -1,4 +1,4 @@ -/* $Id: window.c,v 1.86 2009-07-01 19:42:55 nicm Exp $ */ +/* $Id: window.c,v 1.87 2009-07-02 18:17:46 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -54,8 +54,6 @@ /* Global window list. */ struct windows windows; -const char *window_default_command(void); - RB_GENERATE(winlinks, winlink, entry, winlink_cmp); const char *