From a96dd1932ad43457e710d154edccbfb08c1c2520 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Tue, 19 Feb 2013 09:51:04 +0000 Subject: [PATCH] Don't use a target-client for stdout, just always cmdclient. --- cmd-capture-pane.c | 10 +++------- tmux.1 | 5 +---- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/cmd-capture-pane.c b/cmd-capture-pane.c index 0fd05f9c..3c09d1c4 100644 --- a/cmd-capture-pane.c +++ b/cmd-capture-pane.c @@ -31,9 +31,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:c:E:pS:t:", 0, 0, - "[-p] [-c target-client] [-b buffer-index] [-E end-line] " - "[-S start-line] " + "b:E:pS:t:", 0, 0, + "[-p] [-b buffer-index] [-E end-line] [-S start-line]" CMD_TARGET_PANE_USAGE, 0, NULL, @@ -45,7 +44,7 @@ enum cmd_retval cmd_capture_pane_exec(struct cmd *self, struct cmd_ctx *ctx) { struct args *args = self->args; - struct client *c; + struct client *c = ctx->cmdclient; struct window_pane *wp; char *buf, *line, *cause; struct screen *s; @@ -54,9 +53,6 @@ cmd_capture_pane_exec(struct cmd *self, struct cmd_ctx *ctx) u_int i, limit, top, bottom, tmp; size_t len, linelen; - if ((c = cmd_find_client(ctx, args_get(args, 'c'))) == NULL) - return (CMD_RETURN_ERROR); - if (cmd_find_pane(ctx, args_get(args, 't'), NULL, &wp) == NULL) return (CMD_RETURN_ERROR); s = &wp->base; diff --git a/tmux.1 b/tmux.1 index 0c0e2bd0..98561f93 100644 --- a/tmux.1 +++ b/tmux.1 @@ -1042,7 +1042,6 @@ but a different format may be specified with .It Xo Ic capture-pane .Op Fl p .Op Fl b Ar buffer-index -.Op Fl c Ar target-client .Op Fl E Ar end-line .Op Fl S Ar start-line .Op Fl t Ar target-pane @@ -1051,9 +1050,7 @@ but a different format may be specified with Capture the contents of a pane. If .Fl p -is given, the output goes to -.Ar target-client -stdout, otherwise to the buffer specified with +is given, the output goes to stdout, otherwise to the buffer specified with .Fl b or a new buffer if omitted. .Pp