Merge branch 'obsd-master'

Conflicts:
	tmux.1

1 files changed, 13 insertions, 4 deletions

diff --git a/format.c b/format.c
index ac996f6e..97205481 100644
--- a/format.c
+++ b/format.c
@@ -1232,6 +1232,10 @@ void
 format_defaults(struct format_tree *ft, struct client *c, struct session *s,
     struct winlink *wl, struct window_pane *wp)
 {
+	format_add(ft, "session_format", "%d", s != NULL);
+	format_add(ft, "window_format", "%d", wl != NULL);
+	format_add(ft, "pane_format", "%d", wp != NULL);
+
 	if (s == NULL && c != NULL)
 		s = c->session;
 	if (wl == NULL && s != NULL)
@@ -1480,12 +1484,17 @@ format_defaults_pane(struct format_tree *ft, struct window_pane *wp)
 void
 format_defaults_paste_buffer(struct format_tree *ft, struct paste_buffer *pb)
 {
-	size_t	 bufsize;
-	char	*s;
+	struct timeval	 tv;
+	size_t		 size;
+	char		*s;
+
+	timerclear(&tv);
+	tv.tv_sec = paste_buffer_created(pb);
+	paste_buffer_data(pb, &size);
 
-	paste_buffer_data(pb, &bufsize);
-	format_add(ft, "buffer_size", "%zu", bufsize);
+	format_add(ft, "buffer_size", "%zu", size);
 	format_add(ft, "buffer_name", "%s", paste_buffer_name(pb));
+	format_add_tv(ft, "buffer_created", &tv);
 
 	s = paste_make_sample(pb);
 	format_add(ft, "buffer_sample", "%s", s);