diff options
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/tmux/cmd-queue.c | 8 | ||||
| -rw-r--r-- | usr.bin/tmux/cmd-save-buffer.c | 4 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.1 | 8 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.h | 4 |
4 files changed, 14 insertions, 10 deletions
diff --git a/usr.bin/tmux/cmd-queue.c b/usr.bin/tmux/cmd-queue.c index 81ed3de30a8..fdba8cd15c8 100644 --- a/usr.bin/tmux/cmd-queue.c +++ b/usr.bin/tmux/cmd-queue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-queue.c,v 1.117 2024/05/14 07:52:19 nicm Exp $ */ +/* $OpenBSD: cmd-queue.c,v 1.118 2024/11/22 12:58:05 nicm Exp $ */ /* * Copyright (c) 2013 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -835,9 +835,9 @@ cmdq_guard(struct cmdq_item *item, const char *guard, int flags) /* Show message from command. */ void -cmdq_print_data(struct cmdq_item *item, int parse, struct evbuffer *evb) +cmdq_print_data(struct cmdq_item *item, struct evbuffer *evb) { - server_client_print(item->client, parse, evb); + server_client_print(item->client, 1, evb); } /* Show message from command. */ @@ -855,7 +855,7 @@ cmdq_print(struct cmdq_item *item, const char *fmt, ...) evbuffer_add_vprintf(evb, fmt, ap); va_end(ap); - cmdq_print_data(item, 0, evb); + cmdq_print_data(item, evb); evbuffer_free(evb); } diff --git a/usr.bin/tmux/cmd-save-buffer.c b/usr.bin/tmux/cmd-save-buffer.c index 17905128aad..eb59e8a06aa 100644 --- a/usr.bin/tmux/cmd-save-buffer.c +++ b/usr.bin/tmux/cmd-save-buffer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-save-buffer.c,v 1.55 2022/12/07 09:44:44 nicm Exp $ */ +/* $OpenBSD: cmd-save-buffer.c,v 1.56 2024/11/22 12:58:05 nicm Exp $ */ /* * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org> @@ -102,7 +102,7 @@ cmd_save_buffer_exec(struct cmd *self, struct cmdq_item *item) if (evb == NULL) fatalx("out of memory"); evbuffer_add(evb, bufdata, bufsize); - cmdq_print_data(item, 1, evb); + cmdq_print_data(item, evb); evbuffer_free(evb); return (CMD_RETURN_NORMAL); } diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1 index a68443d2d97..352b1771e65 100644 --- a/usr.bin/tmux/tmux.1 +++ b/usr.bin/tmux/tmux.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: tmux.1,v 1.974 2024/11/21 07:37:21 nicm Exp $ +.\" $OpenBSD: tmux.1,v 1.975 2024/11/22 12:36:13 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: November 21 2024 $ +.Dd $Mdocdate: November 22 2024 $ .Dt TMUX 1 .Os .Sh NAME @@ -2340,6 +2340,9 @@ will do nothing. The .Fl o flag jumps to the beginning of the command output instead of the shell prompt. +Finding the beginning of command output requires the shell to emit an escape +sequence (\e033]133;C\e033\e\e) to tell tmux where the output begins. +If the shell does not send these escape sequences, these commands do nothing. .Pp Copy commands may take an optional buffer prefix argument which is used to generate the buffer name (the default is @@ -4873,6 +4876,7 @@ section. .Pp .It Ic copy-mode-position-format Ar format Format of the position indicator in copy mode. +.Pp .It Xo Ic mode-keys .Op Ic vi | emacs .Xc diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index 80a42c257b7..61e3ed26ea1 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.1244 2024/11/20 20:54:02 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.1245 2024/11/22 12:58:05 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -2682,7 +2682,7 @@ u_int cmdq_next(struct client *); struct cmdq_item *cmdq_running(struct client *); void cmdq_guard(struct cmdq_item *, const char *, int); void printflike(2, 3) cmdq_print(struct cmdq_item *, const char *, ...); -void cmdq_print_data(struct cmdq_item *, int, struct evbuffer *); +void cmdq_print_data(struct cmdq_item *, struct evbuffer *); void printflike(2, 3) cmdq_error(struct cmdq_item *, const char *, ...); /* cmd-wait-for.c */ |