diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2010-03-18 21:02:41 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2010-03-18 21:02:41 +0000 |
| commit | 2307b91ecbd20914bcb2da30bc85e3cc79b0eba1 (patch) | |
| tree | b4ab49a79311b68e554d54956f782bbf73130f51 | |
| parent | a2c87eb89912068b341f9f492c848768438c4043 (diff) | |
| download | rtmux-2307b91ecbd20914bcb2da30bc85e3cc79b0eba1.tar.gz rtmux-2307b91ecbd20914bcb2da30bc85e3cc79b0eba1.tar.bz2 rtmux-2307b91ecbd20914bcb2da30bc85e3cc79b0eba1.zip | |
paste-buffer should be per pane, from C. Coutinho.
| -rw-r--r-- | cmd-paste-buffer.c | 7 | ||||
| -rw-r--r-- | tmux.1 | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/cmd-paste-buffer.c b/cmd-paste-buffer.c index e16d3407..6d457ad0 100644 --- a/cmd-paste-buffer.c +++ b/cmd-paste-buffer.c @@ -1,4 +1,4 @@ -/* $Id: cmd-paste-buffer.c,v 1.24 2009-12-04 22:14:47 tcunha Exp $ */ +/* $Id: cmd-paste-buffer.c,v 1.25 2010-03-18 21:02:41 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -31,7 +31,7 @@ void cmd_paste_buffer_lf2cr(struct window_pane *, const char *, size_t); const struct cmd_entry cmd_paste_buffer_entry = { "paste-buffer", "pasteb", - "[-dr] " CMD_BUFFER_WINDOW_USAGE, + "[-dr] " CMD_BUFFER_PANE_USAGE, 0, "dr", cmd_buffer_init, cmd_buffer_parse, @@ -49,9 +49,8 @@ cmd_paste_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) struct session *s; struct paste_buffer *pb; - if ((wl = cmd_find_window(ctx, data->target, &s)) == NULL) + if ((wl = cmd_find_pane(ctx, data->target, &s, &wp)) == NULL) return (-1); - wp = wl->window->active; if (data->buffer == -1) pb = paste_get_top(&s->buffers); @@ -1,4 +1,4 @@ -.\" $Id: tmux.1,v 1.240 2010-03-16 17:51:32 nicm Exp $ +.\" $Id: tmux.1,v 1.241 2010-03-18 21:02:41 nicm Exp $ .\" .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> .\" @@ -2360,10 +2360,11 @@ Load the contents of the specified paste buffer from .It Xo Ic paste-buffer .Op Fl dr .Op Fl b Ar buffer-index -.Op Fl t Ar target-window +.Op Fl t Ar target-pane .Xc .D1 (alias: Ic pasteb ) -Insert the contents of a paste buffer into the current window. +Insert the contents of a paste buffer into the specified pane. +If not specified, paste into the current one. With .Fl d , also delete the paste buffer from the stack. |