Don't manually specify the target for the command's usage string and instead
use the predefined macros for them which are already used in other places.
---
cmd-capture-pane.c | 3 ++-
cmd-display-message.c | 3 ++-
cmd-list-panes.c | 2 +-
cmd-new-session.c | 4 ++--
cmd-new-window.c | 2 +-
cmd-paste-buffer.c | 2 +-
cmd-send-keys.c | 2 +-
cmd-split-window.c | 2 +-
8 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/cmd-capture-pane.c b/cmd-capture-pane.c
index a94c717..adb827b 100644
--- a/cmd-capture-pane.c
+++ b/cmd-capture-pane.c
@@ -32,7 +32,8 @@ enum cmd_retval cmd_capture_pane_exec(struct cmd *,
struct cmd_ctx *);
const struct cmd_entry cmd_capture_pane_entry = {
"capture-pane", "capturep",
"b:E:S:t:", 0, 0,
- "[-b buffer-index] [-E end-line] [-S start-line] [-t target-pane]",
+ "[-b buffer-index] [-E end-line] [-S start-line] "
+ CMD_TARGET_PANE_USAGE,
0,
NULL,
NULL,
diff --git a/cmd-display-message.c b/cmd-display-message.c
index e31c110..244c557 100644
--- a/cmd-display-message.c
+++ b/cmd-display-message.c
@@ -32,7 +32,8 @@ enum cmd_retval cmd_display_message_exec(struct cmd *,
struct cmd_ctx *);
const struct cmd_entry cmd_display_message_entry = {
"display-message", "display",
"c:pt:F:", 0, 1,
- "[-p] [-c target-client] [-t target-pane] [-F format] [message]",
+ "[-p] [-c target-client] [-F format] " CMD_TARGET_PANE_USAGE
+ " [message]",
0,
NULL,
NULL,
diff --git a/cmd-list-panes.c b/cmd-list-panes.c
index 0934645..4ce25a4 100644
--- a/cmd-list-panes.c
+++ b/cmd-list-panes.c
@@ -38,7 +38,7 @@ void cmd_list_panes_window(struct cmd *,
const struct cmd_entry cmd_list_panes_entry = {
"list-panes", "lsp",
"asF:t:", 0, 0,
- "[-as] [-F format] [-t target]",
+ "[-as] [-F format] " CMD_TARGET_WINDOW_USAGE,
0,
NULL,
NULL,
diff --git a/cmd-new-session.c b/cmd-new-session.c
index 93cf945..bb4cdca 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -36,8 +36,8 @@ enum cmd_retval cmd_new_session_exec(struct cmd *,
struct cmd_ctx *);
const struct cmd_entry cmd_new_session_entry = {
"new-session", "new",
"dn:s:t:x:y:", 0, 1,
- "[-d] [-n window-name] [-s session-name] [-t target-session] "
- "[-x width] [-y height] [command]",
+ "[-d] [-n window-name] [-s session-name] " CMD_TARGET_SESSION_USAGE
+ " [-x width] [-y height] [command]",
CMD_STARTSERVER|CMD_CANTNEST|CMD_SENDENVIRON,
NULL,
cmd_new_session_check,
diff --git a/cmd-new-window.c b/cmd-new-window.c
index f8a7612..d8c576a 100644
--- a/cmd-new-window.c
+++ b/cmd-new-window.c
@@ -32,7 +32,7 @@ const struct cmd_entry cmd_new_window_entry = {
"new-window", "neww",
"ac:dF:kn:Pt:", 0, 1,
"[-adkP] [-c start-directory] [-F format] [-n window-name] "
- "[-t target-window] [command]",
+ CMD_TARGET_WINDOW_USAGE " [command]",
0,
NULL,
NULL,
diff --git a/cmd-paste-buffer.c b/cmd-paste-buffer.c
index 4718d85..05bee5c 100644
--- a/cmd-paste-buffer.c
+++ b/cmd-paste-buffer.c
@@ -35,7 +35,7 @@ void cmd_paste_buffer_filter(struct window_pane *,
const struct cmd_entry cmd_paste_buffer_entry = {
"paste-buffer", "pasteb",
"db:prs:t:", 0, 0,
- "[-dpr] [-s separator] [-b buffer-index] [-t target-pane]",
+ "[-dpr] [-s separator] [-b buffer-index] " CMD_TARGET_PANE_USAGE,
0,
NULL,
NULL,
diff --git a/cmd-send-keys.c b/cmd-send-keys.c
index ec1007b..e19ca3b 100644
--- a/cmd-send-keys.c
+++ b/cmd-send-keys.c
@@ -32,7 +32,7 @@ enum cmd_retval cmd_send_keys_exec(struct cmd *,
struct cmd_ctx *);
const struct cmd_entry cmd_send_keys_entry = {
"send-keys", "send",
"lRt:", 0, -1,
- "[-lR] [-t target-pane] key ...",
+ "[-lR] " CMD_TARGET_PANE_USAGE " key ...",
0,
NULL,
NULL,
diff --git a/cmd-split-window.c b/cmd-split-window.c
index b40b574..cac8095 100644
--- a/cmd-split-window.c
+++ b/cmd-split-window.c
@@ -34,7 +34,7 @@ const struct cmd_entry cmd_split_window_entry = {
"split-window", "splitw",
"c:dF:l:hp:Pt:v", 0, 1,
"[-dhvP] [-c start-directory] [-F format] [-p percentage|-l size] "
- "[-t target-pane] [command]",
+ CMD_TARGET_PANE_USAGE " [command]",
0,
cmd_split_window_key_binding,
NULL,
--
1.7.11.4
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
tmux-users mailing list
tmux-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-users
