diff options
author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2012-12-09 23:17:36 +0000 |
---|---|---|
committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2012-12-09 23:17:36 +0000 |
commit | 1c5152bb6c9b89bbd7b4b1b8508bdd6f4f9163c4 (patch) | |
tree | 3e798862217f6a0f2a18e0a8deb5979891b00fef /usr.bin | |
parent | b2c7a06cb2df314590ef7dd4583f12e26eedb344 (diff) |
Use the CMD_*_USAGE defines consistently, from Thomas Adam.
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/tmux/cmd-capture-pane.c | 5 | ||||
-rw-r--r-- | usr.bin/tmux/cmd-display-message.c | 5 | ||||
-rw-r--r-- | usr.bin/tmux/cmd-list-panes.c | 4 | ||||
-rw-r--r-- | usr.bin/tmux/cmd-new-session.c | 6 | ||||
-rw-r--r-- | usr.bin/tmux/cmd-new-window.c | 4 | ||||
-rw-r--r-- | usr.bin/tmux/cmd-paste-buffer.c | 4 | ||||
-rw-r--r-- | usr.bin/tmux/cmd-send-keys.c | 4 | ||||
-rw-r--r-- | usr.bin/tmux/cmd-split-window.c | 4 |
8 files changed, 19 insertions, 17 deletions
diff --git a/usr.bin/tmux/cmd-capture-pane.c b/usr.bin/tmux/cmd-capture-pane.c index 5da10dadac7..52be26971d3 100644 --- a/usr.bin/tmux/cmd-capture-pane.c +++ b/usr.bin/tmux/cmd-capture-pane.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-capture-pane.c,v 1.12 2012/07/11 07:10:15 nicm Exp $ */ +/* $OpenBSD: cmd-capture-pane.c,v 1.13 2012/12/09 23:17:35 nicm Exp $ */ /* * Copyright (c) 2009 Jonathan Alvarado <radobobo@users.sourceforge.net> @@ -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/usr.bin/tmux/cmd-display-message.c b/usr.bin/tmux/cmd-display-message.c index 65ecd6c73f2..2172c711290 100644 --- a/usr.bin/tmux/cmd-display-message.c +++ b/usr.bin/tmux/cmd-display-message.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-display-message.c,v 1.16 2012/08/14 08:51:53 nicm Exp $ */ +/* $OpenBSD: cmd-display-message.c,v 1.17 2012/12/09 23:17:35 nicm Exp $ */ /* * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org> @@ -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/usr.bin/tmux/cmd-list-panes.c b/usr.bin/tmux/cmd-list-panes.c index 94849f30661..6cf338ae7f1 100644 --- a/usr.bin/tmux/cmd-list-panes.c +++ b/usr.bin/tmux/cmd-list-panes.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-list-panes.c,v 1.15 2012/07/11 07:10:15 nicm Exp $ */ +/* $OpenBSD: cmd-list-panes.c,v 1.16 2012/12/09 23:17:35 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -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/usr.bin/tmux/cmd-new-session.c b/usr.bin/tmux/cmd-new-session.c index 01076dc6e42..0912253d295 100644 --- a/usr.bin/tmux/cmd-new-session.c +++ b/usr.bin/tmux/cmd-new-session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-new-session.c,v 1.46 2012/11/19 10:38:06 nicm Exp $ */ +/* $OpenBSD: cmd-new-session.c,v 1.47 2012/12/09 23:17:35 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -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/usr.bin/tmux/cmd-new-window.c b/usr.bin/tmux/cmd-new-window.c index 83c402444c8..29d430d3b81 100644 --- a/usr.bin/tmux/cmd-new-window.c +++ b/usr.bin/tmux/cmd-new-window.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-new-window.c,v 1.28 2012/10/15 21:53:30 nicm Exp $ */ +/* $OpenBSD: cmd-new-window.c,v 1.29 2012/12/09 23:17:35 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -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/usr.bin/tmux/cmd-paste-buffer.c b/usr.bin/tmux/cmd-paste-buffer.c index 4885f3e4e5b..d7e04effea6 100644 --- a/usr.bin/tmux/cmd-paste-buffer.c +++ b/usr.bin/tmux/cmd-paste-buffer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-paste-buffer.c,v 1.20 2012/11/27 20:22:12 nicm Exp $ */ +/* $OpenBSD: cmd-paste-buffer.c,v 1.21 2012/12/09 23:17:35 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -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/usr.bin/tmux/cmd-send-keys.c b/usr.bin/tmux/cmd-send-keys.c index b99f99bd339..e833191e3c8 100644 --- a/usr.bin/tmux/cmd-send-keys.c +++ b/usr.bin/tmux/cmd-send-keys.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-send-keys.c,v 1.12 2012/07/11 07:10:15 nicm Exp $ */ +/* $OpenBSD: cmd-send-keys.c,v 1.13 2012/12/09 23:17:35 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> @@ -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/usr.bin/tmux/cmd-split-window.c b/usr.bin/tmux/cmd-split-window.c index 4f0218c8e1f..ef9b37b63ee 100644 --- a/usr.bin/tmux/cmd-split-window.c +++ b/usr.bin/tmux/cmd-split-window.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-split-window.c,v 1.36 2012/08/14 08:51:53 nicm Exp $ */ +/* $OpenBSD: cmd-split-window.c,v 1.37 2012/12/09 23:17:35 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -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, |