===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/status.c,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- src/usr.bin/tmux/status.c	2017/01/13 11:56:43	1.159
+++ src/usr.bin/tmux/status.c	2017/02/03 11:57:27	1.160
@@ -1,4 +1,4 @@
-/* $OpenBSD: status.c,v 1.159 2017/01/13 11:56:43 nicm Exp $ */
+/* $OpenBSD: status.c,v 1.160 2017/02/03 11:57:27 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -500,14 +500,19 @@
 {
 	struct format_tree	*ft;
 	char			*expanded;
+	u_int			 tag;
 
 	if (fmt == NULL)
 		return (xstrdup(""));
 
+	if (wl != NULL)
+		tag = FORMAT_WINDOW|wl->window->id;
+	else
+		tag = FORMAT_NONE;
 	if (c->flags & CLIENT_STATUSFORCE)
-		ft = format_create(NULL, FORMAT_STATUS|FORMAT_FORCE);
+		ft = format_create(NULL, tag, FORMAT_STATUS|FORMAT_FORCE);
 	else
-		ft = format_create(NULL, FORMAT_STATUS);
+		ft = format_create(NULL, tag, FORMAT_STATUS);
 	format_defaults(ft, c, NULL, wl, NULL);
 
 	expanded = format_expand_time(ft, fmt, t);
@@ -665,7 +670,7 @@
 	time_t			 t;
 	char			*tmp;
 
-	ft = format_create(NULL, 0);
+	ft = format_create(NULL, FORMAT_NONE, 0);
 	format_defaults(ft, c, NULL, NULL, NULL);
 
 	t = time(NULL);
@@ -726,7 +731,7 @@
 	time_t			 t;
 	char			*tmp;
 
-	ft = format_create(NULL, 0);
+	ft = format_create(NULL, FORMAT_NONE, 0);
 	format_defaults(ft, c, NULL, NULL, NULL);
 
 	t = time(NULL);