Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2026-03-27 12:01:10 +00:00
2 changed files with 17 additions and 1 deletions

View File

@@ -1355,6 +1355,18 @@ format_cb_alternate_saved_y(struct format_tree *ft)
return (NULL); return (NULL);
} }
/* Callback for bracket_paste_flag. */
static void *
format_cb_bracket_paste_flag(struct format_tree *ft)
{
if (ft->wp != NULL && ft->wp->screen != NULL) {
if (ft->wp->screen->mode & MODE_BRACKETPASTE)
return (xstrdup("1"));
return (xstrdup("0"));
}
return (NULL);
}
/* Callback for buffer_name. */ /* Callback for buffer_name. */
static void * static void *
format_cb_buffer_name(struct format_tree *ft) format_cb_buffer_name(struct format_tree *ft)
@@ -3049,6 +3061,9 @@ static const struct format_table_entry format_table[] = {
{ "alternate_saved_y", FORMAT_TABLE_STRING, { "alternate_saved_y", FORMAT_TABLE_STRING,
format_cb_alternate_saved_y format_cb_alternate_saved_y
}, },
{ "bracket_paste_flag", FORMAT_TABLE_STRING,
format_cb_bracket_paste_flag
},
{ "buffer_created", FORMAT_TABLE_TIME, { "buffer_created", FORMAT_TABLE_TIME,
format_cb_buffer_created format_cb_buffer_created
}, },

3
tmux.1
View File

@@ -6259,6 +6259,7 @@ The following variables are available, where appropriate:
.It Li "alternate_on" Ta "" Ta "1 if pane is in alternate screen" .It Li "alternate_on" Ta "" Ta "1 if pane is in alternate screen"
.It Li "alternate_saved_x" Ta "" Ta "Saved cursor X in alternate screen" .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 "alternate_saved_y" Ta "" Ta "Saved cursor Y in alternate screen"
.It Li "bracket_paste_flag" Ta "" Ta "Pane bracketed paste flag"
.It Li "buffer_created" Ta "" Ta "Time buffer created" .It Li "buffer_created" Ta "" Ta "Time buffer created"
.It Li "buffer_full" Ta "" Ta "Full buffer content" .It Li "buffer_full" Ta "" Ta "Full buffer content"
.It Li "buffer_name" Ta "" Ta "Name of buffer" .It Li "buffer_name" Ta "" Ta "Name of buffer"
@@ -7183,7 +7184,7 @@ If
is not given, the is not given, the
.Ic display\-time .Ic display\-time
option is used; a delay of zero waits for a key press. option is used; a delay of zero waits for a key press.
.Ql N .Fl N
ignores key presses and closes only after the delay expires. ignores key presses and closes only after the delay expires.
If If
.Fl C .Fl C