Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2020-03-28 10:01:27 +00:00
5 changed files with 30 additions and 5 deletions

View File

@ -2436,6 +2436,8 @@ void
format_defaults(struct format_tree *ft, struct client *c, struct session *s,
struct winlink *wl, struct window_pane *wp)
{
struct paste_buffer *pb;
if (c != NULL && c->name != NULL)
log_debug("%s: c=%s", __func__, c->name);
else
@ -2475,6 +2477,10 @@ format_defaults(struct format_tree *ft, struct client *c, struct session *s,
format_defaults_winlink(ft, wl);
if (wp != NULL)
format_defaults_pane(ft, wp);
pb = paste_get_top (NULL);
if (pb != NULL)
format_defaults_paste_buffer(ft, pb);
}
/* Set default format keys for a session. */