diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2010-03-22 19:13:29 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2010-03-22 19:13:29 +0000 |
| commit | 99ef1ba9c0e0c108d58f652bc5bb813f02470220 (patch) | |
| tree | 6dd98e55ee34fa739377770dd6db138df8fdaed7 /usr.bin/tmux | |
| parent | 1cb601ff5db2fcd6cbd660aa31e706950f9e402c (diff) | |
paste-buffer should be per pane, from C. Coutinho.
Diffstat (limited to 'usr.bin/tmux')
| -rw-r--r-- | usr.bin/tmux/cmd-paste-buffer.c | 7 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.1 | 7 | ||||
| -rw-r--r-- | usr.bin/tmux/window-copy.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/tmux/cmd-paste-buffer.c b/usr.bin/tmux/cmd-paste-buffer.c index 72ae85607a1..74ff479a97e 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.10 2009/12/03 22:50:10 nicm Exp $ */ +/* $OpenBSD: cmd-paste-buffer.c,v 1.11 2010/03/22 19:13:28 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); diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1 index c18d880fcdb..0198d118c8b 100644 --- a/usr.bin/tmux/tmux.1 +++ b/usr.bin/tmux/tmux.1 @@ -1,4 +1,4 @@ -.\" $Id: tmux.1,v 1.157 2010/03/22 19:10:42 nicm Exp $ +.\" $OpenBSD: tmux.1,v 1.158 2010/03/22 19:13:28 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. diff --git a/usr.bin/tmux/window-copy.c b/usr.bin/tmux/window-copy.c index 9c2a658e961..c3d8c08f95c 100644 --- a/usr.bin/tmux/window-copy.c +++ b/usr.bin/tmux/window-copy.c @@ -1,4 +1,4 @@ -/* $Id: window-copy.c,v 1.52 2010/03/22 19:10:42 nicm Exp $ */ +/* $OpenBSD: window-copy.c,v 1.53 2010/03/22 19:13:28 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> |