2 files changed, 7 insertions, 1 deletions
diff --git a/format.c b/format.c
index da241c48..630e75d6 100644
--- a/format.c
+++ b/format.c
@@ -2421,6 +2421,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
@@ -2460,6 +2462,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. */
diff --git a/tmux.1 b/tmux.1
index 263bedc1..aec7f79e 100644
--- a/tmux.1
+++ b/tmux.1
@@ -5024,7 +5024,7 @@ It may be empty to discard any key presses.
 If
 .Fl K
 is given together with
-.Fl R,
+.Fl R ,
 key presses are instead passed to the
 .Fl R
 shell command.