mirror of
https://github.com/tmux/tmux.git
synced 2025-12-21 14:56:05 +00:00
Merge branch 'obsd-master'
This commit is contained in:
18
format.c
18
format.c
@@ -1369,6 +1369,21 @@ format_cb_buffer_sample(struct format_tree *ft)
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
/* Callback for buffer_full. */
|
||||
static void *
|
||||
format_cb_buffer_full(struct format_tree *ft)
|
||||
{
|
||||
size_t size;
|
||||
const char *s;
|
||||
|
||||
if (ft->pb != NULL) {
|
||||
s = paste_buffer_data(ft->pb, &size);
|
||||
if (s != NULL)
|
||||
return (xstrndup(s, size));
|
||||
}
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
/* Callback for buffer_size. */
|
||||
static void *
|
||||
format_cb_buffer_size(struct format_tree *ft)
|
||||
@@ -3008,6 +3023,9 @@ static const struct format_table_entry format_table[] = {
|
||||
{ "buffer_created", FORMAT_TABLE_TIME,
|
||||
format_cb_buffer_created
|
||||
},
|
||||
{ "buffer_full", FORMAT_TABLE_STRING,
|
||||
format_cb_buffer_full
|
||||
},
|
||||
{ "buffer_mode_format", FORMAT_TABLE_STRING,
|
||||
format_cb_buffer_mode_format
|
||||
},
|
||||
|
||||
4
input.c
4
input.c
@@ -2657,7 +2657,9 @@ input_exit_apc(struct input_ctx *ictx)
|
||||
return;
|
||||
log_debug("%s: \"%s\"", __func__, ictx->input_buf);
|
||||
|
||||
if (screen_set_title(sctx->s, ictx->input_buf) && wp != NULL) {
|
||||
if (wp != NULL &&
|
||||
options_get_number(wp->options, "allow-set-title") &&
|
||||
screen_set_title(sctx->s, ictx->input_buf)) {
|
||||
notify_pane("pane-title-changed", wp);
|
||||
server_redraw_window_borders(wp->window);
|
||||
server_status_window(wp->window);
|
||||
|
||||
1
tmux.1
1
tmux.1
@@ -6058,6 +6058,7 @@ The following variables are available, where appropriate:
|
||||
.It Li "alternate_saved_x" Ta "" Ta "Saved cursor X in alternate screen"
|
||||
.It Li "alternate_saved_y" Ta "" Ta "Saved cursor Y in alternate screen"
|
||||
.It Li "buffer_created" Ta "" Ta "Time buffer created"
|
||||
.It Li "buffer_full" Ta "" Ta "Full buffer content"
|
||||
.It Li "buffer_name" Ta "" Ta "Name of buffer"
|
||||
.It Li "buffer_sample" Ta "" Ta "Sample of start of buffer"
|
||||
.It Li "buffer_size" Ta "" Ta "Size of the specified buffer in bytes"
|
||||
|
||||
Reference in New Issue
Block a user