Merge branch 'obsd-master'

Conflicts:
	cmd-find.c

1 files changed, 5 insertions, 1 deletions

diff --git a/format.c b/format.c
index acfcb531..4b15e0fa 100644
--- a/format.c
+++ b/format.c
@@ -1022,7 +1022,7 @@ format_defaults_pane(struct format_tree *ft, struct window_pane *wp)
 {
 	struct grid	*gd = wp->base.grid;
 	u_int		 idx;
-	int  		 status;
+	int  		 status, scroll_position;
 
 	if (ft->w == NULL)
 		ft->w = wp->window;
@@ -1070,6 +1070,10 @@ format_defaults_pane(struct format_tree *ft, struct window_pane *wp)
 	format_add(ft, "scroll_region_upper", "%u", wp->base.rupper);
 	format_add(ft, "scroll_region_lower", "%u", wp->base.rlower);
 
+	scroll_position = window_copy_scroll_position(wp);
+	if (scroll_position != -1)
+		format_add(ft, "scroll_position", "%d", scroll_position);
+
 	format_add(ft, "alternate_on", "%d", wp->saved_grid ? 1 : 0);
 	format_add(ft, "alternate_saved_x", "%u", wp->saved_cx);
 	format_add(ft, "alternate_saved_y", "%u", wp->saved_cy);