===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/format.c,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- src/usr.bin/tmux/format.c	2017/07/27 10:42:05	1.144
+++ src/usr.bin/tmux/format.c	2017/08/02 11:10:48	1.145
@@ -1,4 +1,4 @@
-/* $OpenBSD: format.c,v 1.144 2017/07/27 10:42:05 nicm Exp $ */
+/* $OpenBSD: format.c,v 1.145 2017/08/02 11:10:48 nicm Exp $ */
 
 /*
  * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1373,7 +1373,7 @@
 {
 	struct grid	*gd = wp->base.grid;
 	u_int		 idx;
-	int  		 status, scroll_position;
+	int  		 status;
 
 	if (ft->w == NULL)
 		ft->w = wp->window;
@@ -1430,9 +1430,7 @@
 	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);
+	window_copy_add_formats(wp, ft);
 
 	format_add(ft, "alternate_on", "%d", wp->saved_grid ? 1 : 0);
 	format_add(ft, "alternate_saved_x", "%u", wp->saved_cx);