circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2024-11-22 14:01:11 +00:00
parent 0f308bd18f 5fd45b3892
commit ceaf9b7452
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd-queue.c
View File

@@ -834,9 +834,9 @@ cmdq_guard(struct cmdq_item *item, const char *guard, int flags)
/* Show message from command. */ /* Show message from command. */
void 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. */ /* Show message from command. */
@@ -854,7 +854,7 @@ cmdq_print(struct cmdq_item *item, const char *fmt, ...)
evbuffer_add_vprintf(evb, fmt, ap); evbuffer_add_vprintf(evb, fmt, ap);
va_end(ap); va_end(ap);
cmdq_print_data(item, 0, evb); cmdq_print_data(item, evb);
evbuffer_free(evb); evbuffer_free(evb);
} }

2
cmd-save-buffer.c
View File

@@ -101,7 +101,7 @@ cmd_save_buffer_exec(struct cmd *self, struct cmdq_item *item)
if (evb == NULL) if (evb == NULL)
fatalx("out of memory"); fatalx("out of memory");
evbuffer_add(evb, bufdata, bufsize); evbuffer_add(evb, bufdata, bufsize);
cmdq_print_data(item, 1, evb); cmdq_print_data(item, evb);
evbuffer_free(evb); evbuffer_free(evb);
return (CMD_RETURN_NORMAL); return (CMD_RETURN_NORMAL);
} }

4
tmux.1
View File

@@ -2342,6 +2342,9 @@ will do nothing.
The The
.Fl o .Fl o
flag jumps to the beginning of the command output instead of the shell prompt. 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 .Pp
Copy commands may take an optional buffer prefix argument which is used Copy commands may take an optional buffer prefix argument which is used
to generate the buffer name (the default is to generate the buffer name (the default is
@@ -4875,6 +4878,7 @@ section.
.Pp .Pp
.It Ic copy-mode-position-format Ar format .It Ic copy-mode-position-format Ar format
Format of the position indicator in copy mode. Format of the position indicator in copy mode.
.Pp
.It Xo Ic mode-keys .It Xo Ic mode-keys
.Op Ic vi | emacs .Op Ic vi | emacs
.Xc .Xc

2
tmux.h
View File

@@ -2727,7 +2727,7 @@ u_int cmdq_next(struct client *);
struct cmdq_item *cmdq_running(struct client *); struct cmdq_item *cmdq_running(struct client *);
void cmdq_guard(struct cmdq_item *, const char *, int); void cmdq_guard(struct cmdq_item *, const char *, int);
void printflike(2, 3) cmdq_print(struct cmdq_item *, const char *, ...); 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 *, ...); void printflike(2, 3) cmdq_error(struct cmdq_item *, const char *, ...);
/* cmd-wait-for.c */ /* cmd-wait-for.c */