diff options
| author | Nicholas Marriott <nicm@openbsd.org> | 2010-03-22 19:13:28 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@openbsd.org> | 2010-03-22 19:13:28 +0000 |
| commit | 9abbe349af66a749202cd1df42b32a0997b0ba6f (patch) | |
| tree | 08e80e5e8a0454e6bf739019b59c82df9c89172b | |
| parent | 509ce7f76697841eecfa11a8137d5ba03ce349da (diff) | |
| download | rtmux-9abbe349af66a749202cd1df42b32a0997b0ba6f.tar.gz rtmux-9abbe349af66a749202cd1df42b32a0997b0ba6f.tar.bz2 rtmux-9abbe349af66a749202cd1df42b32a0997b0ba6f.zip | |
paste-buffer should be per pane, from C. Coutinho.
| -rw-r--r-- | cmd-paste-buffer.c | 5 | ||||
| -rw-r--r-- | tmux.1 | 7 | ||||
| -rw-r--r-- | window-copy.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/cmd-paste-buffer.c b/cmd-paste-buffer.c index 1abf09a7..46934629 100644 --- a/cmd-paste-buffer.c +++ b/cmd-paste-buffer.c @@ -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$ +.\" $OpenBSD$ .\" .\" 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/window-copy.c b/window-copy.c index 03666399..5d915dee 100644 --- a/window-copy.c +++ b/window-copy.c @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $OpenBSD$ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> |