diff options
author | Tiago Cunha <tcunha@gmx.com> | 2012-08-31 09:18:50 +0000 |
---|---|---|
committer | Tiago Cunha <tcunha@gmx.com> | 2012-08-31 09:18:50 +0000 |
commit | 1c608031b596f6e92e575a16a7acd56fb3b78f70 (patch) | |
tree | b91c8d61110743470c9af825f94b91ddda53ae70 /cmd-choose-tree.c | |
parent | d50f157f7e9c1b61cada6f1b29dd5465be0b153e (diff) | |
download | rtmux-1c608031b596f6e92e575a16a7acd56fb3b78f70.tar.gz rtmux-1c608031b596f6e92e575a16a7acd56fb3b78f70.tar.bz2 rtmux-1c608031b596f6e92e575a16a7acd56fb3b78f70.zip |
Sync OpenBSD patchset 1162:
Use a separate define for each default format template and strip clutter
from the choose-tree defaults.
Diffstat (limited to 'cmd-choose-tree.c')
-rw-r--r-- | cmd-choose-tree.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/cmd-choose-tree.c b/cmd-choose-tree.c index 7132017e..eae7ee4f 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; } /* |