diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2024-03-21 11:32:50 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2024-03-21 11:32:50 +0000 |
| commit | d65a9996aeb94cc36b02c37b015a331e98f2bf56 (patch) | |
| tree | 9f6a0cba71b5ce47b97976dbc4c5640e96d61843 | |
| parent | e6a3e920d7fec82eaf13118223badcc5f403242c (diff) | |
Use -p for default paste-buffer command in buffer mode, it will only do
anything if the application asked for it. From Gregory Anders.
| -rw-r--r-- | usr.bin/tmux/tmux.1 | 6 | ||||
| -rw-r--r-- | usr.bin/tmux/window-buffer.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1 index b0f6a0d58f9..658bb25e056 100644 --- a/usr.bin/tmux/tmux.1 +++ b/usr.bin/tmux/tmux.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: tmux.1,v 1.937 2024/03/13 11:25:50 nicm Exp $ +.\" $OpenBSD: tmux.1,v 1.938 2024/03/21 11:32:49 nicm Exp $ .\" .\" Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> .\" @@ -14,7 +14,7 @@ .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: March 13 2024 $ +.Dd $Mdocdate: March 21 2024 $ .Dt TMUX 1 .Os .Sh NAME @@ -6469,7 +6469,7 @@ is replaced by the buffer name in and the result executed as a command. If .Ar template -is not given, "paste-buffer -b \[aq]%%\[aq]" is used. +is not given, "paste-buffer -p -b \[aq]%%\[aq]" is used. .Pp .Fl O specifies the initial sort field: one of diff --git a/usr.bin/tmux/window-buffer.c b/usr.bin/tmux/window-buffer.c index 21821495e6c..c677c646f78 100644 --- a/usr.bin/tmux/window-buffer.c +++ b/usr.bin/tmux/window-buffer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: window-buffer.c,v 1.37 2022/11/03 08:41:53 nicm Exp $ */ +/* $OpenBSD: window-buffer.c,v 1.38 2024/03/21 11:32:49 nicm Exp $ */ /* * Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -36,7 +36,7 @@ static void window_buffer_key(struct window_mode_entry *, struct client *, struct session *, struct winlink *, key_code, struct mouse_event *); -#define WINDOW_BUFFER_DEFAULT_COMMAND "paste-buffer -b '%%'" +#define WINDOW_BUFFER_DEFAULT_COMMAND "paste-buffer -p -b '%%'" #define WINDOW_BUFFER_DEFAULT_FORMAT \ "#{t/p:buffer_created}: #{buffer_sample}" |