From 73c678553809956f428fec9db3210a5576d5883f Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Tue, 14 Aug 2012 08:51:53 +0000 Subject: Use a separate define for each default format template and strip clutter from the choose-tree defaults. --- cmd-choose-tree.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'cmd-choose-tree.c') diff --git a/cmd-choose-tree.c b/cmd-choose-tree.c index 102fdc3c..e4fd267e 100644 --- a/cmd-choose-tree.c +++ b/cmd-choose-tree.c @@ -27,8 +27,6 @@ #define CMD_CHOOSE_TREE_WINDOW_ACTION "select-window -t '%%'" #define CMD_CHOOSE_TREE_SESSION_ACTION "switch-client -t '%%'" -#define CMD_CHOOSE_TREE_WINDOW_TEMPLATE \ - DEFAULT_WINDOW_TEMPLATE " \"#{pane_title}\"" /* * Enter choice mode to choose a session and/or window. @@ -104,7 +102,7 @@ cmd_choose_tree_exec(struct cmd *self, struct cmd_ctx *ctx) if (self->entry == &cmd_choose_session_entry) { sflag = 1; if ((ses_template = args_get(args, 'F')) == NULL) - ses_template = DEFAULT_SESSION_TEMPLATE; + ses_template = CHOOSE_TREE_SESSION_TEMPLATE; if (args->argc != 0) ses_action = args->argv[0]; @@ -113,7 +111,7 @@ cmd_choose_tree_exec(struct cmd *self, struct cmd_ctx *ctx) } else if (self->entry == &cmd_choose_window_entry) { wflag = 1; if ((win_template = args_get(args, 'F')) == NULL) - win_template = CMD_CHOOSE_TREE_WINDOW_TEMPLATE; + win_template = CHOOSE_TREE_WINDOW_TEMPLATE; if (args->argc != 0) win_action = args->argv[0]; @@ -130,10 +128,10 @@ cmd_choose_tree_exec(struct cmd *self, struct cmd_ctx *ctx) win_action = CMD_CHOOSE_TREE_WINDOW_ACTION; if ((ses_template = args_get(args, 'S')) == NULL) - ses_template = DEFAULT_SESSION_TEMPLATE; + ses_template = CHOOSE_TREE_SESSION_TEMPLATE; if ((win_template = args_get(args, 'W')) == NULL) - win_template = CMD_CHOOSE_TREE_WINDOW_TEMPLATE; + win_template = CHOOSE_TREE_WINDOW_TEMPLATE; } /* -- cgit v1.2.3