From 3a0016a78a2d2bc77a4dc52fb03edbaf7b0a1ad3 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicm@openbsd.org>
Date: Sun, 9 Dec 2012 23:17:35 +0000
Subject: [PATCH] Use the CMD_*_USAGE defines consistently, from Thomas Adam.

---
 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 f38fcb76..86c614e9 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 a520e3db..899957f8 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 7a8d81d2..717562a4 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 0fcea353..ee161808 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 2f111935..331c9fc8 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 06402ebb..c957ba2f 100644
--- a/cmd-paste-buffer.c
+++ b/cmd-paste-buffer.c
@@ -36,7 +36,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 4a5c3656..f6124d3a 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 2d51d357..d225ce23 100644
--- a/cmd-split-window.c
+++ b/cmd-split-window.c
@@ -35,7 +35,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,